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.

2 files changed, 4 insertions, 6 deletions

diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py
index 1568b0de..1dff4a6b 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 a4e9c86c..561dcda5 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__