diff options
Diffstat (limited to 'rtemstoolkit/windows.py')
| -rw-r--r-- | rtemstoolkit/windows.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/rtemstoolkit/windows.py b/rtemstoolkit/windows.py index be4e1f6..f8007d8 100644 --- a/rtemstoolkit/windows.py +++ b/rtemstoolkit/windows.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,17 +32,25 @@ # Windows specific support and overrides. # -import error import pprint import os -import execute +# +# 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 +except (ValueError, SystemError): + import error + import execute def load(): # Default to the native Windows Python. uname = 'win32' system = 'mingw32' - if os.environ.has_key('HOSTTYPE'): + if 'HOSTTYPE' in os.environ: hosttype = os.environ['HOSTTYPE'] else: hosttype = 'i686' @@ -68,7 +76,7 @@ def load(): except: pass - if os.environ.has_key('NUMBER_OF_PROCESSORS'): + if 'NUMBER_OF_PROCESSORS' in os.environ: ncpus = os.environ['NUMBER_OF_PROCESSORS'] else: ncpus = '1' |