diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-04-17 13:16:00 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-04-17 13:16:00 (GMT) |
| commit | e254cdf344ed0a466661b319dc019f2400ad12f3 (patch) | |
| tree | 61e16d3edbaa1230dfa20699c4584c87d9b3f725 /QMTest | |
| parent | e4b439f4265613556de0124593ac86898d6f52c7 (diff) | |
| download | SCons-e254cdf344ed0a466661b319dc019f2400ad12f3.zip SCons-e254cdf344ed0a466661b319dc019f2400ad12f3.tar.gz SCons-e254cdf344ed0a466661b319dc019f2400ad12f3.tar.bz2 | |
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Fix the 'assignment to True or False' and the '__getitem__ not supported for
exception classes' deprecation warnings.
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestCmd.py | 2 | ||||
| -rw-r--r-- | QMTest/TestSCons.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index 1568b0d..1dff4a6 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -765,7 +765,7 @@ class Popen(subprocess.Popen): try: written = os.write(self.stdin.fileno(), input) except OSError, why: - if why[0] == errno.EPIPE: #broken pipe + if why.args[0] == errno.EPIPE: #broken pipe return self._close('stdin') raise diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index a4e9c86..561dcda 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -24,12 +24,10 @@ import sys import time try: - x = True + True except NameError: - True = not 0 - False = not 1 -else: - del x + exec('True = not 0') + exec('False = not 1') from TestCommon import * from TestCommon import __all__ |