diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Util.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/compat/_scons_subprocess.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/cpp.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py index 709cf1f..a373863 100644 --- a/src/engine/SCons/Util.py +++ b/src/engine/SCons/Util.py @@ -1082,7 +1082,7 @@ class OrderedDict(UserDict): return dict def items(self): - return zip(self._keys, self.values()) + return list(zip(self._keys, self.values())) def keys(self): return self._keys[:] diff --git a/src/engine/SCons/compat/_scons_subprocess.py b/src/engine/SCons/compat/_scons_subprocess.py index ccd403a..417dd60 100644 --- a/src/engine/SCons/compat/_scons_subprocess.py +++ b/src/engine/SCons/compat/_scons_subprocess.py @@ -820,7 +820,7 @@ class Popen(object): startupinfo.wShowWindow = SW_HIDE comspec = os.environ.get("COMSPEC", "cmd.exe") args = comspec + " /c " + args - if (GetVersion() >= 0x80000000L or + if (GetVersion() >= 0x80000000 or os.path.basename(comspec).lower() == "command.com"): # Win9x, or using command.com on NT. We need to # use the w9xpopen intermediate program. For more diff --git a/src/engine/SCons/cpp.py b/src/engine/SCons/cpp.py index 4a826ba..5ccc00e 100644 --- a/src/engine/SCons/cpp.py +++ b/src/engine/SCons/cpp.py @@ -151,7 +151,7 @@ CPP_to_Python_Eval_List = [ ['/\*.*\*/', ''], ['/\*.*', ''], ['//.*', ''], - ['(0x[0-9A-Fa-f]*)[UL]+', '\\1L'], + ['(0x[0-9A-Fa-f]*)[UL]+', '\\1'], ] # Replace the string representations of the regular expressions in the |