Fixed tests to work with python3.x and python2.x

1 files changed, 9 insertions, 3 deletions

diff --git a/tests/samplebinding/enum_test.py b/tests/samplebinding/enum_test.py
index f81f8b0a8..fefe75ce3 100644
--- a/tests/samplebinding/enum_test.py
+++ b/tests/samplebinding/enum_test.py
@@ -70,12 +70,12 @@ class EnumTest(unittest.TestCase):
     def testBuildingEnumWithDefaultValue(self):
         '''Enum constructor with default value'''
         enum = SampleNamespace.Option()
-        self.assertEqual(enum, SampleNamespace.None)
+        self.assertEqual(enum, SampleNamespace.None_)
 
     def testEnumConversionToAndFromPython(self):
         '''Conversion of enum objects from Python to C++ back again.'''
         enumout = SampleNamespace.enumInEnumOut(SampleNamespace.TwoIn)
-        self.assert_(enumout, SampleNamespace.TwoOut)
+        self.assertTrue(enumout, SampleNamespace.TwoOut)
         self.assertEqual(repr(enumout), repr(SampleNamespace.TwoOut))
 
     def testEnumConstructorWithTooManyParameters(self):
@@ -105,7 +105,13 @@ class EnumTest(unittest.TestCase):
     def testEnumTpPrintImplementation(self):
         '''Without SbkEnum.tp_print 'print' returns the enum represented as an int.'''
         tmpfile = createTempFile()
-        print(Event.ANY_EVENT, file=tmpfile)
+        if IS_PY3K:
+            from py3k import printToFile
+            printToFile(tmpfile, Event.ANY_EVENT)
+        else:
+            sys.stdout = tmpfile
+            print(Event.ANY_EVENT)
+            sys.stdout = sys.__stdout__
         tmpfile.seek(0)
         text = tmpfile.read().strip()
         tmpfile.close()