diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-04-20 21:09:45 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-04-20 21:09:45 (GMT) |
| commit | fcd10ca3c39538542594aec5f894fc00fa58bdb1 (patch) | |
| tree | 170c627b8d259510e58f19cd0222e442c8ffb0bc /QMTest | |
| parent | 58a7d5c595a74e266d63fd5e621329ba24d4e75e (diff) | |
| download | SCons-fcd10ca3c39538542594aec5f894fc00fa58bdb1.zip SCons-fcd10ca3c39538542594aec5f894fc00fa58bdb1.tar.gz SCons-fcd10ca3c39538542594aec5f894fc00fa58bdb1.tar.bz2 | |
http://scons.tigris.org/issues/show_bug.cgi?id=2345
One-line changes: Wrap pickle.dump with staticmethod(). Keep softspace in
Unbuffered wrapper class for backward compatibility with 3.x. Use ModuleType
as a factory function rather than a base class. Derive exception class from
something derived from BaseException (required for 3.x).
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestCmd.py | 2 | ||||
| -rw-r--r-- | QMTest/TestSCons.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index ab1c212..e715acc 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -574,7 +574,7 @@ except ImportError: # so we're going to cobble up something that looks just enough # like its API for our purposes below. from types import ModuleType - class subprocess(ModuleType): pass + subprocess = ModuleType('subprocess') subprocess.PIPE = 'PIPE' subprocess.STDOUT = 'STDOUT' diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 0317149..fa3163b 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -807,7 +807,7 @@ SConscript( sconscript ) logfile, sconf_dir, sconstruct, doCheckLog=1, doCheckStdout=1): - class NoMatch: + class NoMatch(Exception): def __init__(self, p): self.pos = p |