diff options
author | Greg Noel <GregNoel@tigris.org> | 2010-03-29 05:50:15 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2010-03-29 05:50:15 (GMT) |
commit | 7adebb06bb6055345cc584377159d8052ea39e1b (patch) | |
tree | d0ca5f58b87d964927a1db7f4fe8a602f8405d23 /QMTest | |
parent | 59ed0a109bf5add2efcef459080837b11066c6fb (diff) | |
download | SCons-7adebb06bb6055345cc584377159d8052ea39e1b.zip SCons-7adebb06bb6055345cc584377159d8052ea39e1b.tar.gz SCons-7adebb06bb6055345cc584377159d8052ea39e1b.tar.bz2 |
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Accumulated small fixers: renames, next, zip, and intern.
Files that were modified or added while developing on branches/pending didn't
have the fixers previously applied. This patchset picks up those.
Diffstat (limited to 'QMTest')
-rw-r--r-- | QMTest/TestCmd.py | 9 | ||||
-rw-r--r-- | QMTest/TestSCons.py | 11 |
2 files changed, 0 insertions, 20 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index 7c8e1a5..a7f97d7 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -302,15 +302,6 @@ except ImportError: else: atexit.register(_clean) -try: - zip -except NameError: - def zip(*lists): - result = [] - for i in xrange(min(list(map(len, lists)))): - result.append(tuple([l[i] for l in lists])) - return result - class Collector: def __init__(self, top): self.entries = [top] diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index a1ec227..b7e019d 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -23,17 +23,6 @@ import shutil import sys import time -import __builtin__ -try: - __builtin__.zip -except AttributeError: - def zip(*lists): - result = [] - for i in xrange(len(lists[0])): - result.append(tuple([l[i] for l in lists])) - return result - __builtin__.zip = zip - try: x = True except NameError: |