http://scons.tigris.org/issues/show_bug.cgi?id=2341

Wrap a zip() expression in list().

http://scons.tigris.org/issues/show_bug.cgi?id=2342

Remove the 'L' from 'long' variables (no longer needed).

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4731 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 709cf1f0524b8888aa3884ff5c1367deea438dc8..a373863d0ec7ea821caf85441293b6764c34ab2e 100644 (file)
--- 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 ccd403a724bc249e2a8466c69e47e845327df5f4..417dd609351c01b73e0a32ad31c7cb98084d94be 100644 (file)
--- 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 4a826ba7a42239c23930c64eea1e6d49468c33c2..5ccc00e14ac6123cddcc231f309398dee7f0b51b 100644 (file)
--- 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