Merge branch 'release/3.0.0+repack-1'3.0.0+repack-1

1 files changed, 27 insertions, 20 deletions

diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py
index c2a8ad6..edc4ca8 100644
--- a/src/engine/SCons/BuilderTests.py
+++ b/src/engine/SCons/BuilderTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001 - 2016 The SCons Foundation
+# Copyright (c) 2001 - 2017 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,8 +20,9 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+from __future__ import print_function
 
-__revision__ = "src/engine/SCons/BuilderTests.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
+__revision__ = "src/engine/SCons/BuilderTests.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
 
 import SCons.compat
 
@@ -145,8 +146,8 @@ class Environment(object):
         d['SOURCES'] = ['__s1__', '__s2__', '__s3__', '__s4__', '__s5__', '__s6__']
         d['SOURCE'] = d['SOURCES'][0]
         return d
-    def __cmp__(self, other):
-        return cmp(self.scanner, other.scanner) or cmp(self.d, other.d)
+    def __eq__(self, other):
+        return self.scanner == other.scanner or self.d == other.d
 
 class MyAction(object):
     def __init__(self, action):
@@ -327,7 +328,7 @@ class BuilderTestCase(unittest.TestCase):
         flag = 0
         try:
             target = builder(env, None, source=n20)
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             flag = 1
         assert flag, "UserError should be thrown if a source node can't create a target."
 
@@ -343,7 +344,7 @@ class BuilderTestCase(unittest.TestCase):
                                         suffix = '.s')
         try:
             builder(env, target = 'n22', source = 'n22')
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             pass
         else:
             raise Exception("Did not catch expected UserError.")
@@ -1499,11 +1500,12 @@ class CompositeBuilderTestCase(unittest.TestCase):
         flag = 0
         try:
             builder(env, target='test3', source=['test2.bar', 'test1.foo'])[0]
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             flag = 1
+            err = e
         assert flag, "UserError should be thrown when we call a builder with files of different suffixes."
         expect = "While building `['test3']' from `test1.foo': Cannot build multiple sources with different extensions: .bar, .foo"
-        assert str(e) == expect, e
+        assert str(err) == expect, err
 
     def test_source_ext_match(self):
         """Test the CompositeBuilder source_ext_match argument"""
@@ -1530,8 +1532,8 @@ class CompositeBuilderTestCase(unittest.TestCase):
         try:
             tgt.build()
             flag = 1
-        except SCons.Errors.UserError, e:
-            print e
+        except SCons.Errors.UserError as e:
+            print(e)
             flag = 0
         assert flag, "It should be possible to define actions in composite builders using variables."
         env['FOO_SUFFIX'] = '.BAR2'
@@ -1583,47 +1585,52 @@ class CompositeBuilderTestCase(unittest.TestCase):
         flag = 0
         try:
             builder(env, target='t5', source=['test5a.foo', 'test5b.inb'])[0]
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             flag = 1
+            err = e
         assert flag, "UserError should be thrown when we call a builder with files of different suffixes."
         expect = "While building `['t5']' from `test5b.bar': Cannot build multiple sources with different extensions: .foo, .bar"
-        assert str(e) == expect, e
+        assert str(err) == expect, err
 
         flag = 0
         try:
             builder(env, target='t6', source=['test6a.bar', 'test6b.ina'])[0]
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             flag = 1
+            err = e
         assert flag, "UserError should be thrown when we call a builder with files of different suffixes."
         expect = "While building `['t6']' from `test6b.foo': Cannot build multiple sources with different extensions: .bar, .foo"
-        assert str(e) == expect, e
+        assert str(err) == expect, err
 
         flag = 0
         try:
             builder(env, target='t4', source=['test4a.ina', 'test4b.inb'])[0]
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             flag = 1
+            err = e
         assert flag, "UserError should be thrown when we call a builder with files of different suffixes."
         expect = "While building `['t4']' from `test4b.bar': Cannot build multiple sources with different extensions: .foo, .bar"
-        assert str(e) == expect, e
+        assert str(err) == expect, err
 
         flag = 0
         try:
             builder(env, target='t7', source=[env.fs.File('test7')])[0]
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             flag = 1
+            err = e
         assert flag, "UserError should be thrown when we call a builder with files of different suffixes."
         expect = "While building `['t7']': Cannot deduce file extension from source files: ['test7']"
-        assert str(e) == expect, e
+        assert str(err) == expect, err
 
         flag = 0
         try:
             builder(env, target='t8', source=['test8.unknown'])[0]
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             flag = 1
+            err = e
         assert flag, "UserError should be thrown when we call a builder target with an unknown suffix."
         expect = "While building `['t8']' from `['test8.unknown']': Don't know how to build from a source file with suffix `.unknown'.  Expected a suffix in this list: ['.foo', '.bar']."
-        assert str(e) == expect, e
+        assert str(err) == expect, err
 
 if __name__ == "__main__":
     suite = unittest.TestSuite()