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.

7 files changed, 12 insertions, 19 deletions

diff --git a/test/Deprecated/Options/BoolOption.py b/test/Deprecated/Options/BoolOption.py
index d99544f..0955d87 100644
--- a/test/Deprecated/Options/BoolOption.py
+++ b/test/Deprecated/Options/BoolOption.py
@@ -31,8 +31,8 @@ Test the BoolOption canned Option type.
 try:
     True, False
 except NameError:
-    True = (0 == 0)
-    False = (0 != 0)
+    exec('True = (0 == 0)')
+    exec('False = (0 != 0)')
 
 import TestSCons
 
diff --git a/test/Deprecated/Options/PackageOption.py b/test/Deprecated/Options/PackageOption.py
index b9f0400..3d15de0 100644
--- a/test/Deprecated/Options/PackageOption.py
+++ b/test/Deprecated/Options/PackageOption.py
@@ -33,8 +33,8 @@ import os.path
 try:
     True, False
 except NameError:
-    True = (0 == 0)
-    False = (0 != 0)
+    exec('True = (0 == 0)')
+    exec('False = (0 != 0)')
 
 import TestSCons
 
diff --git a/test/Deprecated/Options/help.py b/test/Deprecated/Options/help.py
index 9e9adee..0b7226b 100644
--- a/test/Deprecated/Options/help.py
+++ b/test/Deprecated/Options/help.py
@@ -34,8 +34,8 @@ import re
 try:
     True, False
 except NameError:
-    True = (0 == 0)
-    False = (0 != 0)
+    exec('True = (0 == 0)')
+    exec('False = (0 != 0)')
 
 str_True = str(True)
 str_False = str(False)
diff --git a/test/NodeOps.py b/test/NodeOps.py
index 6de7d09..5062b72 100644
--- a/test/NodeOps.py
+++ b/test/NodeOps.py
@@ -121,13 +121,6 @@ sconscript = r"""
 import os
 Import('*')
 
-import __builtin__
-try:
-    __builtin__.True
-except AttributeError:
-    __builtin__.True = 1
-    __builtin__.False = 0
-
 def mycopy(env, source, target):
     open(str(target[0]),'w').write(open(str(source[0]),'r').read())
 
diff --git a/test/Variables/BoolVariable.py b/test/Variables/BoolVariable.py
index 37130c0..e3ebabd 100644
--- a/test/Variables/BoolVariable.py
+++ b/test/Variables/BoolVariable.py
@@ -33,8 +33,8 @@ import os.path
 try:
     True, False
 except NameError:
-    True = (0 == 0)
-    False = (0 != 0)
+    exec('True = (0 == 0)')
+    exec('False = (0 != 0)')
 
 import TestSCons
 
diff --git a/test/Variables/PackageVariable.py b/test/Variables/PackageVariable.py
index 6ad7fc1..172d5e4 100644
--- a/test/Variables/PackageVariable.py
+++ b/test/Variables/PackageVariable.py
@@ -33,8 +33,8 @@ import os.path
 try:
     True, False
 except NameError:
-    True = (0 == 0)
-    False = (0 != 0)
+    exec('True = (0 == 0)')
+    exec('False = (0 != 0)')
 
 import TestSCons
 
diff --git a/test/Variables/help.py b/test/Variables/help.py
index 0a0a969..6776327 100644
--- a/test/Variables/help.py
+++ b/test/Variables/help.py
@@ -33,8 +33,8 @@ import os.path
 try:
     True, False
 except NameError:
-    True = (0 == 0)
-    False = (0 != 0)
+    exec('True = (0 == 0)')
+    exec('False = (0 != 0)')
 
 str_True = str(True)
 str_False = str(False)