String literal fixes for compativility with Python3

1 files changed, 74 insertions, 73 deletions

diff --git a/python/test/Ice/operations/Twoways.py b/python/test/Ice/operations/Twoways.py
index 04dcee69f1a..8944ed4d94a 100644
--- a/python/test/Ice/operations/Twoways.py
+++ b/python/test/Ice/operations/Twoways.py
@@ -8,6 +8,7 @@
 # **********************************************************************
 
 import Ice, math, Test, array, sys
+from sys import version_info
 
 def test(b):
     if not b:
@@ -17,82 +18,82 @@ def twoways(communicator, p):
     
     literals = p.opStringLiterals();
         
-    test(Test.s0 == "\\" and
-         Test.s0 == Test.sw0 and
-         Test.s0 == literals[0] and
-         Test.s0 == literals[11]);
-
-    test(Test.s1 == "A" and
-         Test.s1 == Test.sw1 and
-         Test.s1 == literals[1] and
-         Test.s1 == literals[12]);
-
-    test(Test.s2 == "Ice" and
-         Test.s2 == Test.sw2 and
-         Test.s2 == literals[2] and
-         Test.s2 == literals[13]);
+    test(Test.s0 == "\\")
+    test(Test.s0 == Test.sw0)
+    test(Test.s0 == literals[0])
+    test(Test.s0 == literals[11])
+
+    test(Test.s1 == "A")
+    test(Test.s1 == Test.sw1)
+    test(Test.s1 == literals[1])
+    test(Test.s1 == literals[12])
+
+    test(Test.s2 == "Ice")
+    test(Test.s2 == Test.sw2)
+    test(Test.s2 == literals[2])
+    test(Test.s2 == literals[13])
     
-    test(Test.s3 == "A21" and 
-         Test.s3 == Test.sw3 and
-         Test.s3 == literals[3] and
-         Test.s3 == literals[14]);
-
-    test(Test.s4 == "\\u0041 \\U00000041" and
-         Test.s4 == Test.sw4 and
-         Test.s4 == literals[4] and
-         Test.s4 == literals[15]);
-
-    test(Test.s5 == "\xc3\xbf" and
-         Test.s5 == Test.sw5 and
-         Test.s5 == literals[5] and
-         Test.s5 == literals[16]);
-
-    test(Test.s6 == "\xcf\xbf" and
-         Test.s6 == Test.sw6 and
-         Test.s6 == literals[6] and
-         Test.s6 == literals[17]);
-
-    test(Test.s7 == "\xd7\xb0" and
-         Test.s7 == Test.sw7 and
-         Test.s7 == literals[7] and
-         Test.s7 == literals[18]);
-
-    test(Test.s8 == "\xf0\x90\x80\x80" and
-         Test.s8 == Test.sw8 and
-         Test.s8 == literals[8] and
-         Test.s8 == literals[19]);
+    test(Test.s3 == "A21")
+    test(Test.s3 == Test.sw3)
+    test(Test.s3 == literals[3])
+    test(Test.s3 == literals[14])
+
+    test(Test.s4 == "\\u0041 \\U00000041")
+    test(Test.s4 == Test.sw4)
+    test(Test.s4 == literals[4])
+    test(Test.s4 == literals[15])
+
+    test(Test.s5 == "\xc3\xbf" if version_info[0] < 3 else b"\xc3\xbf".decode("utf-8"))
+    test(Test.s5 == Test.sw5)
+    test(Test.s5 == literals[5])
+    test(Test.s5 == literals[16])
+
+    test(Test.s6 == "\xcf\xbf" if version_info[0] < 3 else b"\xcf\xbf".decode("utf-8"))
+    test(Test.s6 == Test.sw6)
+    test(Test.s6 == literals[6])
+    test(Test.s6 == literals[17])
+
+    test(Test.s7 == "\xd7\xb0" if version_info[0] < 3 else b"\xd7\xb0".decode("utf-8"))
+    test(Test.s7 == Test.sw7)
+    test(Test.s7 == literals[7])
+    test(Test.s7 == literals[18])
+
+    test(Test.s8 == "\xf0\x90\x80\x80" if version_info[0] < 3 else b"\xf0\x90\x80\x80".decode("utf-8"))
+    test(Test.s8 == Test.sw8)
+    test(Test.s8 == literals[8])
+    test(Test.s8 == literals[19])
     
-    test(Test.s9 == "\xf0\x9f\x8d\x8c" and
-         Test.s9 == Test.sw9 and
-         Test.s9 == literals[9] and
-         Test.s9 == literals[20]);
-
-    test(Test.s10 == "\xe0\xb6\xa7" and
-         Test.s10 == Test.sw10 and
-         Test.s10 == literals[10] and
-         Test.s10 == literals[21]);
-
-    test(Test.ss0 == "\'\"\x3f\\\a\b\f\n\r\t\v" and
-         Test.ss0 == Test.ss1 and
-         Test.ss0 == Test.ss2 and
-         Test.ss0 == literals[22] and
-         Test.ss0 == literals[23] and
-         Test.ss0 == literals[24]);
+    test(Test.s9 == "\xf0\x9f\x8d\x8c" if version_info[0] < 3 else b"\xf0\x9f\x8d\x8c".decode("utf-8"))
+    test(Test.s9 == Test.sw9)
+    test(Test.s9 == literals[9])
+    test(Test.s9 == literals[20])
+
+    test(Test.s10 == "\xe0\xb6\xa7" if version_info[0] < 3 else b"\xe0\xb6\xa7".decode("utf-8"))
+    test(Test.s10 == Test.sw10)
+    test(Test.s10 == literals[10])
+    test(Test.s10 == literals[21])
+
+    test(Test.ss0 == "\'\"\x3f\\\a\b\f\n\r\t\v")
+    test(Test.ss0 == Test.ss1)
+    test(Test.ss0 == Test.ss2)
+    test(Test.ss0 == literals[22])
+    test(Test.ss0 == literals[23])
+    test(Test.ss0 == literals[24])
     
-    test(Test.ss3 == "\\\\U\\u\\" and
-         Test.ss3 == literals[25]);
-
-    test(Test.ss4 == "\\A\\" and
-         Test.ss4 == literals[26]);
-
-    test(Test.ss5 == "\\u0041\\" and
-         Test.ss5 == literals[27]);
-            
-    test(Test.su0 == Test.su1 and
-         Test.su0 == Test.su2 and
-         Test.su0 == literals[28] and
-         Test.su0 == literals[29] and
-         Test.su0 == literals[30]);
+    test(Test.ss3 == "\\\\U\\u\\")
+    test(Test.ss3 == literals[25])
+
+    test(Test.ss4 == "\\A\\")
+    test(Test.ss4 == literals[26])
+
+    test(Test.ss5 == "\\u0041\\")
+    test(Test.ss5 == literals[27])
+
+    test(Test.su0 == Test.su1)
+    test(Test.su0 == Test.su2)
+    test(Test.su0 == literals[28])
+    test(Test.su0 == literals[29])
+    test(Test.su0 == literals[30])
 
     #
     # ice_ping