diff options
author | Tobias Markmann <tm@ayena.de> | 2018-07-12 09:02:56 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2018-07-12 09:02:56 (GMT) |
commit | 95b04304452c4cf0a01f676a12779dacc6fa51a4 (patch) | |
tree | 9a8dce3db8213b68901893a0a6d371243684c3ee /BuildTools/SCons/Tools/InstallWithSymLinks.py | |
parent | 2bb40b14d3d7f5cebc56601dad066d5201040bd2 (diff) | |
download | swift-95b04304452c4cf0a01f676a12779dacc6fa51a4.zip swift-95b04304452c4cf0a01f676a12779dacc6fa51a4.tar.bz2 |
Fix Python 3 compatibility of our SCons and tooling Python code
For the upcoming update to Scons 3, which works with Python 2
and Python 3, this change makes our code compatible with
Python 3 so that it still works with Python 2.
Test-Information:
Tested these changes with SCons 3.0.1 on macOS 10.13.6 with
Python 2.7.15 and Python 3.7.0.
Change-Id: Idb5207b179a79a0dbe89d7e620d182a7d2f1ca6c
Diffstat (limited to 'BuildTools/SCons/Tools/InstallWithSymLinks.py')
-rw-r--r-- | BuildTools/SCons/Tools/InstallWithSymLinks.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/BuildTools/SCons/Tools/InstallWithSymLinks.py b/BuildTools/SCons/Tools/InstallWithSymLinks.py index 23d12ed..4955192 100644 --- a/BuildTools/SCons/Tools/InstallWithSymLinks.py +++ b/BuildTools/SCons/Tools/InstallWithSymLinks.py @@ -74,21 +74,21 @@ def scons_copytree(src, dst, symlinks=False): else: shutil.copy2(srcname, dstname) # XXX What about devices, sockets etc.? - except (IOError, os.error), why: + except (IOError, os.error) as why: errors.append((srcname, dstname, str(why))) # catch the CopytreeError from the recursive copytree so that we can # continue with other files - except CopytreeError, err: + except CopytreeError as err: errors.extend(err.args[0]) try: shutil.copystat(src, dst) except WindowsError: # can't copy file access times on Windows pass - except OSError, why: + except OSError as why: errors.extend((src, dst, str(why))) if errors: - raise CopytreeError, errors + raise CopytreeError(errors) def symlinkBuilderImpl(target, source, env): |