python 3 support

1 files changed, 104 insertions, 78 deletions

diff --git a/py/test/Ice/slicing/exceptions/AllTests.py b/py/test/Ice/slicing/exceptions/AllTests.py
index 9e44f294a3a..5bedb5d4f71 100644
--- a/py/test/Ice/slicing/exceptions/AllTests.py
+++ b/py/test/Ice/slicing/exceptions/AllTests.py
@@ -44,7 +44,7 @@ class Callback(CallbackBase):
     def exception_baseAsBase(self, exc):
         try:
             raise exc
-        except Test.Base, b:
+        except Test.Base as b:
             test(b.b == "Base.b")
             test(b.ice_name() =="Test::Base")
         except:
@@ -54,7 +54,7 @@ class Callback(CallbackBase):
     def exception_unknownDerivedAsBase(self, exc):
         try:
             raise exc
-        except Test.Base, b:
+        except Test.Base as b:
             test(b.b == "UnknownDerived.b")
             test(b.ice_name() =="Test::Base")
         except:
@@ -64,7 +64,7 @@ class Callback(CallbackBase):
     def exception_knownDerivedAsBase(self, exc):
         try:
             raise exc
-        except Test.KnownDerived, k:
+        except Test.KnownDerived as k:
             test(k.b == "KnownDerived.b")
             test(k.kd == "KnownDerived.kd")
             test(k.ice_name() =="Test::KnownDerived")
@@ -75,7 +75,7 @@ class Callback(CallbackBase):
     def exception_knownDerivedAsKnownDerived(self, exc):
         try:
             raise exc
-        except Test.KnownDerived, k:
+        except Test.KnownDerived as k:
             test(k.b == "KnownDerived.b")
             test(k.kd == "KnownDerived.kd")
             test(k.ice_name() =="Test::KnownDerived")
@@ -86,7 +86,7 @@ class Callback(CallbackBase):
     def exception_unknownIntermediateAsBase(self, exc):
         try:
             raise exc
-        except Test.Base, b:
+        except Test.Base as b:
             test(b.b == "UnknownIntermediate.b")
             test(b.ice_name() =="Test::Base")
         except:
@@ -96,7 +96,7 @@ class Callback(CallbackBase):
     def exception_knownIntermediateAsBase(self, exc):
         try:
             raise exc
-        except Test.KnownIntermediate, ki:
+        except Test.KnownIntermediate as ki:
             test(ki.b == "KnownIntermediate.b")
             test(ki.ki == "KnownIntermediate.ki")
             test(ki.ice_name() =="Test::KnownIntermediate")
@@ -107,7 +107,7 @@ class Callback(CallbackBase):
     def exception_knownMostDerivedAsBase(self, exc):
         try:
             raise exc
-        except Test.KnownMostDerived, kmd:
+        except Test.KnownMostDerived as kmd:
             test(kmd.b == "KnownMostDerived.b")
             test(kmd.ki == "KnownMostDerived.ki")
             test(kmd.kmd == "KnownMostDerived.kmd")
@@ -119,7 +119,7 @@ class Callback(CallbackBase):
     def exception_knownIntermediateAsKnownIntermediate(self, exc):
         try:
             raise exc
-        except Test.KnownIntermediate, ki:
+        except Test.KnownIntermediate as ki:
             test(ki.b == "KnownIntermediate.b")
             test(ki.ki == "KnownIntermediate.ki")
             test(ki.ice_name() =="Test::KnownIntermediate")
@@ -130,7 +130,7 @@ class Callback(CallbackBase):
     def exception_knownMostDerivedAsKnownMostDerived(self, exc):
         try:
             raise exc
-        except Test.KnownMostDerived, kmd:
+        except Test.KnownMostDerived as kmd:
             test(kmd.b == "KnownMostDerived.b")
             test(kmd.ki == "KnownMostDerived.ki")
             test(kmd.kmd == "KnownMostDerived.kmd")
@@ -142,7 +142,7 @@ class Callback(CallbackBase):
     def exception_knownMostDerivedAsKnownIntermediate(self, exc):
         try:
             raise exc
-        except Test.KnownMostDerived, kmd:
+        except Test.KnownMostDerived as kmd:
             test(kmd.b == "KnownMostDerived.b")
             test(kmd.ki == "KnownMostDerived.ki")
             test(kmd.kmd == "KnownMostDerived.kmd")
@@ -154,7 +154,7 @@ class Callback(CallbackBase):
     def exception_unknownMostDerived1AsBase(self, exc):
         try:
             raise exc
-        except Test.KnownIntermediate, ki:
+        except Test.KnownIntermediate as ki:
             test(ki.b == "UnknownMostDerived1.b")
             test(ki.ki == "UnknownMostDerived1.ki")
             test(ki.ice_name() =="Test::KnownIntermediate")
@@ -165,7 +165,7 @@ class Callback(CallbackBase):
     def exception_unknownMostDerived1AsKnownIntermediate(self, exc):
         try:
             raise exc
-        except Test.KnownIntermediate, ki:
+        except Test.KnownIntermediate as ki:
             test(ki.b == "UnknownMostDerived1.b")
             test(ki.ki == "UnknownMostDerived1.ki")
             test(ki.ice_name() =="Test::KnownIntermediate")
@@ -176,7 +176,7 @@ class Callback(CallbackBase):
     def exception_unknownMostDerived2AsBase(self, exc):
         try:
             raise exc
-        except Test.Base, b:
+        except Test.Base as b:
             test(b.b == "UnknownMostDerived2.b")
             test(b.ice_name() =="Test::Base")
         except:
@@ -187,237 +187,263 @@ def allTests(communicator):
     obj = communicator.stringToProxy("Test:default -p 12010")
     t = Test.TestIntfPrx.checkedCast(obj)
 
-    print "base... ",
+    sys.stdout.write("base... ")
+    sys.stdout.flush()
     try:
         t.baseAsBase()
         test(false)
-    except Test.Base, b:
+    except Test.Base as b:
         test(b.b == "Base.b")
         test(b.ice_name() == "Test::Base")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "base (AMI)... ",
+    sys.stdout.write("base (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_baseAsBase(cb.response, cb.exception_baseAsBase)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown derived... ",
+    sys.stdout.write("slicing of unknown derived... ")
+    sys.stdout.flush()
     try:
         t.unknownDerivedAsBase()
         test(false)
-    except Test.Base, b:
+    except Test.Base as b:
         test(b.b == "UnknownDerived.b")
         test(b.ice_name() == "Test::Base")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown derived (AMI)... ",
+    sys.stdout.write("slicing of unknown derived (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_unknownDerivedAsBase(cb.response, cb.exception_unknownDerivedAsBase)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known derived as base... ",
+    sys.stdout.write("non-slicing of known derived as base... ")
+    sys.stdout.flush()
     try:
         t.knownDerivedAsBase()
         test(false)
-    except Test.KnownDerived, k:
+    except Test.KnownDerived as k:
         test(k.b == "KnownDerived.b")
         test(k.kd == "KnownDerived.kd")
         test(k.ice_name() == "Test::KnownDerived")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known derived as base (AMI)... ",
+    sys.stdout.write("non-slicing of known derived as base (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_knownDerivedAsBase(cb.response, cb.exception_knownDerivedAsBase)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known derived as derived... ",
+    sys.stdout.write("non-slicing of known derived as derived... ")
+    sys.stdout.flush()
     try:
         t.knownDerivedAsKnownDerived()
         test(false)
-    except Test.KnownDerived, k:
+    except Test.KnownDerived as k:
         test(k.b == "KnownDerived.b")
         test(k.kd == "KnownDerived.kd")
         test(k.ice_name() == "Test::KnownDerived")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known derived as derived (AMI)... ",
+    sys.stdout.write("non-slicing of known derived as derived (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_knownDerivedAsKnownDerived(cb.response, cb.exception_knownDerivedAsKnownDerived)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown intermediate as base... ",
+    sys.stdout.write("slicing of unknown intermediate as base... ")
+    sys.stdout.flush()
     try:
         t.unknownIntermediateAsBase()
         test(false)
-    except Test.Base, b:
+    except Test.Base as b:
         test(b.b == "UnknownIntermediate.b")
         test(b.ice_name() == "Test::Base")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown intermediate as base (AMI)... ",
+    sys.stdout.write("slicing of unknown intermediate as base (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_unknownIntermediateAsBase(cb.response, cb.exception_unknownIntermediateAsBase)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "slicing of known intermediate as base... ",
+    sys.stdout.write("slicing of known intermediate as base... ")
+    sys.stdout.flush()
     try:
         t.knownIntermediateAsBase()
         test(false)
-    except Test.KnownIntermediate, ki:
+    except Test.KnownIntermediate as ki:
         test(ki.b == "KnownIntermediate.b")
         test(ki.ki == "KnownIntermediate.ki")
         test(ki.ice_name() == "Test::KnownIntermediate")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "slicing of known intermediate as base (AMI)... ",
+    sys.stdout.write("slicing of known intermediate as base (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_knownIntermediateAsBase(cb.response, cb.exception_knownIntermediateAsBase)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "slicing of known most derived as base... ",
+    sys.stdout.write("slicing of known most derived as base... ")
+    sys.stdout.flush()
     try:
         t.knownMostDerivedAsBase()
         test(false)
-    except Test.KnownMostDerived, kmd:
+    except Test.KnownMostDerived as kmd:
         test(kmd.b == "KnownMostDerived.b")
         test(kmd.ki == "KnownMostDerived.ki")
         test(kmd.kmd == "KnownMostDerived.kmd")
         test(kmd.ice_name() == "Test::KnownMostDerived")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "slicing of known most derived as base (AMI)... ",
+    sys.stdout.write("slicing of known most derived as base (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_knownMostDerivedAsBase(cb.response, cb.exception_knownMostDerivedAsBase)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known intermediate as intermediate... ",
+    sys.stdout.write("non-slicing of known intermediate as intermediate... ")
+    sys.stdout.flush()
     try:
         t.knownIntermediateAsKnownIntermediate()
         test(false)
-    except Test.KnownIntermediate, ki:
+    except Test.KnownIntermediate as ki:
         test(ki.b == "KnownIntermediate.b")
         test(ki.ki == "KnownIntermediate.ki")
         test(ki.ice_name() == "Test::KnownIntermediate")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known intermediate as intermediate (AMI)... ",
+    sys.stdout.write("non-slicing of known intermediate as intermediate (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_knownIntermediateAsKnownIntermediate(cb.response, cb.exception_knownIntermediateAsKnownIntermediate)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known most derived exception as intermediate... ",
+    sys.stdout.write("non-slicing of known most derived exception as intermediate... ")
+    sys.stdout.flush()
     try:
         t.knownMostDerivedAsKnownIntermediate()
         test(false)
-    except Test.KnownMostDerived, kmd:
+    except Test.KnownMostDerived as kmd:
         test(kmd.b == "KnownMostDerived.b")
         test(kmd.ki == "KnownMostDerived.ki")
         test(kmd.kmd == "KnownMostDerived.kmd")
         test(kmd.ice_name() == "Test::KnownMostDerived")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known most derived as intermediate (AMI)... ",
+    sys.stdout.write("non-slicing of known most derived as intermediate (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_knownMostDerivedAsKnownIntermediate(cb.response, cb.exception_knownMostDerivedAsKnownIntermediate)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known most derived as most derived... ",
+    sys.stdout.write("non-slicing of known most derived as most derived... ")
+    sys.stdout.flush()
     try:
         t.knownMostDerivedAsKnownMostDerived()
         test(false)
-    except Test.KnownMostDerived, kmd:
+    except Test.KnownMostDerived as kmd:
         test(kmd.b == "KnownMostDerived.b")
         test(kmd.ki == "KnownMostDerived.ki")
         test(kmd.kmd == "KnownMostDerived.kmd")
         test(kmd.ice_name() == "Test::KnownMostDerived")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "non-slicing of known most derived as most derived (AMI)... ",
+    sys.stdout.write("non-slicing of known most derived as most derived (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_knownMostDerivedAsKnownMostDerived(cb.response, cb.exception_knownMostDerivedAsKnownMostDerived)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown most derived, known intermediate as base... ",
+    sys.stdout.write("slicing of unknown most derived, known intermediate as base... ")
+    sys.stdout.flush()
     try:
         t.unknownMostDerived1AsBase()
         test(false)
-    except Test.KnownIntermediate, ki:
+    except Test.KnownIntermediate as ki:
         test(ki.b == "UnknownMostDerived1.b")
         test(ki.ki == "UnknownMostDerived1.ki")
         test(ki.ice_name() == "Test::KnownIntermediate")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown most derived, known intermediate as base (AMI)... ",
+    sys.stdout.write("slicing of unknown most derived, known intermediate as base (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_unknownMostDerived1AsBase(cb.response, cb.exception_unknownMostDerived1AsBase)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown most derived, known intermediate as intermediate... ",
+    sys.stdout.write("slicing of unknown most derived, known intermediate as intermediate... ")
+    sys.stdout.flush()
     try:
         t.unknownMostDerived1AsKnownIntermediate()
         test(false)
-    except Test.KnownIntermediate, ki:
+    except Test.KnownIntermediate as ki:
         test(ki.b == "UnknownMostDerived1.b")
         test(ki.ki == "UnknownMostDerived1.ki")
         test(ki.ice_name() == "Test::KnownIntermediate")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown most derived, known intermediate as intermediate (AMI)... ",
+    sys.stdout.write("slicing of unknown most derived, known intermediate as intermediate (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_unknownMostDerived1AsKnownIntermediate(cb.response, cb.exception_unknownMostDerived1AsKnownIntermediate)
     cb.check()
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown most derived, unknown intermediate as base... ",
+    sys.stdout.write("slicing of unknown most derived, unknown intermediate as base... ")
+    sys.stdout.flush()
     try:
         t.unknownMostDerived2AsBase()
         test(false)
-    except Test.Base, b:
+    except Test.Base as b:
         test(b.b == "UnknownMostDerived2.b")
         test(b.ice_name() == "Test::Base")
     except:
         test(False)
-    print "ok"
+    print("ok")
 
-    print "slicing of unknown most derived, unknown intermediate as base (AMI)... ",
+    sys.stdout.write("slicing of unknown most derived, unknown intermediate as base (AMI)... ")
+    sys.stdout.flush()
     cb = Callback()
     t.begin_unknownMostDerived2AsBase(cb.response, cb.exception_unknownMostDerived2AsBase)
     cb.check()
-    print "ok"
+    print("ok")
 
     return t