diff options
Diffstat (limited to 'rtemstoolkit/path.py')
| -rw-r--r-- | rtemstoolkit/path.py | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/rtemstoolkit/path.py b/rtemstoolkit/path.py index 238e6d9..2e235b3 100644 --- a/rtemstoolkit/path.py +++ b/rtemstoolkit/path.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'. @@ -34,13 +34,23 @@ # level. This allows macro expansion to work. # +from __future__ import print_function + import glob -import log import os import shutil import string -import error +# +# 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 log +except (ValueError, SystemError): + import error + import log windows = os.name == 'nt' @@ -122,24 +132,24 @@ def mkdir(path): if windows: try: os.makedirs(host(path)) - except IOError, err: + except IOError as err: raise error.general('cannot make directory: %s' % (path)) - except OSError, err: + except OSError as err: raise error.general('cannot make directory: %s' % (path)) - except WindowsError, err: + except WindowsError as err: raise error.general('cannot make directory: %s' % (path)) else: try: os.makedirs(host(path)) - except IOError, err: + except IOError as err: raise error.general('cannot make directory: %s' % (path)) - except OSError, err: + except OSError as err: raise error.general('cannot make directory: %s' % (path)) def removeall(path): def _onerror(function, path, excinfo): - print 'removeall error: (%s) %s' % (excinfo, path) + print('removeall error: (%s) %s' % (excinfo, path)) path = host(path) shutil.rmtree(path, onerror = _onerror) @@ -208,13 +218,13 @@ def copy_tree(src, dst): copy_tree(srcname, dstname) else: shutil.copy2(srcname, dstname) - except shutil.Error, err: + except shutil.Error as err: raise error.general('copying tree: %s -> %s: %s' % (src, dst, str(err))) - except EnvironmentError, why: + except EnvironmentError as why: raise error.general('copying tree: %s -> %s: %s' % (srcname, dstname, str(why))) try: shutil.copystat(src, dst) - except OSError, why: + except OSError as why: ok = False if windows: if WindowsError is not None and isinstance(why, WindowsError): @@ -223,17 +233,17 @@ def copy_tree(src, dst): raise error.general('copying tree: %s -> %s: %s' % (src, dst, str(why))) if __name__ == '__main__': - print host('/a/b/c/d-e-f') - print host('//a/b//c/d-e-f') - print shell('/w/x/y/z') - print basename('/as/sd/df/fg/me.txt') - print dirname('/as/sd/df/fg/me.txt') - print join('/d', 'g', '/tyty/fgfg') + print(host('/a/b/c/d-e-f')) + print(host('//a/b//c/d-e-f')) + print(shell('/w/x/y/z')) + print(basename('/as/sd/df/fg/me.txt')) + print(dirname('/as/sd/df/fg/me.txt')) + print(join('/d', 'g', '/tyty/fgfg')) windows = True - print host('/a/b/c/d-e-f') - print host('//a/b//c/d-e-f') - print shell('/w/x/y/z') - print shell('w:/x/y/z') - print basename('x:/sd/df/fg/me.txt') - print dirname('x:/sd/df/fg/me.txt') - print join('s:/d/', '/g', '/tyty/fgfg') + print(host('/a/b/c/d-e-f')) + print(host('//a/b//c/d-e-f')) + print(shell('/w/x/y/z')) + print(shell('w:/x/y/z')) + print(basename('x:/sd/df/fg/me.txt')) + print(dirname('x:/sd/df/fg/me.txt')) + print(join('s:/d/', '/g', '/tyty/fgfg')) |