diff options
Diffstat (limited to 'rtemstoolkit/check.py')
-rw-r--r-- | rtemstoolkit/check.py | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/rtemstoolkit/check.py b/rtemstoolkit/check.py index f4c05b8..2890bd8 100644 --- a/rtemstoolkit/check.py +++ b/rtemstoolkit/check.py @@ -1,6 +1,6 @@ # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2010-2014 Chris Johns (chrisj@rtems.org) +# Copyright 2010-2016 Chris Johns (chrisj@rtems.org) # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -32,14 +32,28 @@ # Check the defaults for a specific host. # +from __future__ import print_function + import os -import error -import execute -import log -import options -import path -import version +# +# Support to handle use in a package and as a unit test. +# If there is a better way to let us know. +# +try: + from . import error + from . import execute + from . import log + from . import options + from . import path + from . import version +except (ValueError, SystemError): + import error + import execute + import log + import options + import path + import version def _check_none(_opts, macro, value, constraint): return True @@ -117,7 +131,7 @@ def host_setup(opts): sane = True - for d in opts.defaults.keys(): + for d in list(opts.defaults.keys()): try: (test, constraint, value) = opts.defaults.get(d) except: @@ -155,16 +169,16 @@ def run(): _opts = options.load(args = sys.argv) log.notice('RTEMS Source Builder - Check, v%s' % (version.str())) if host_setup(_opts): - print 'Environment is ok' + print('Environment is ok') else: - print 'Environment is not correctly set up' - except error.general, gerr: - print gerr + print('Environment is not correctly set up') + except error.general as gerr: + print(gerr) sys.exit(1) - except error.internal, ierr: - print ierr + except error.internal as ierr: + print(ierr) sys.exit(1) - except error.exit, eerr: + except error.exit as eerr: pass except KeyboardInterrupt: log.notice('abort: user terminated') |