Swiftdiff 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/Version.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/Version.py')
| -rw-r--r-- | BuildTools/SCons/Version.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/BuildTools/SCons/Version.py b/BuildTools/SCons/Version.py index d34c2a7..b69cdca 100644 --- a/BuildTools/SCons/Version.py +++ b/BuildTools/SCons/Version.py @@ -8,3 +8,3 @@ def getGitBuildVersion(root, project) : if tag : - m = re.match(project + "-(.*)-(.*)-(.*)", tag) + m = re.match(project + "-(.*)-(.*)-(.*)", tag.decode('utf-8')) if m : @@ -19,3 +19,3 @@ def git(cmd, root) : # if error: - # print "Git error: " + error + # print("Git error: " + error) p.stdin.close() @@ -40,3 +40,3 @@ def getBuildVersion(root, project) : def convertToWindowsVersion(version) : - version_match = re.match("(\d+)\.(\d+)(.*)", version) + version_match = re.match("(\d+)\.(\d+)(.*)", version.decode('utf-8')) major = version_match and int(version_match.group(1)) or 0 |