diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-04-24 14:16:15 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-04-24 14:16:15 -0700 |
| commit | 943a48fc5c0a59b892eb746073c71b8dd88815e7 (patch) | |
| tree | 421cfedbc60603d02e0b314d9204e9f85dd781c5 /py/test/Ice/custom/Server.py | |
| parent | minor fix to IcePHP getLogger (diff) | |
| download | ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.bz2 ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.xz ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.zip | |
python 3 support
Diffstat (limited to 'py/test/Ice/custom/Server.py')
| -rwxr-xr-x | py/test/Ice/custom/Server.py | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/py/test/Ice/custom/Server.py b/py/test/Ice/custom/Server.py index 22664625afa..65ef09e80d0 100755 --- a/py/test/Ice/custom/Server.py +++ b/py/test/Ice/custom/Server.py @@ -20,7 +20,10 @@ def test(b): class CustomI(Test.Custom): def opByteString1(self, b1, current=None): - test(isinstance(b1, str)) + if sys.version_info[0] == 2: + test(isinstance(b1, str)) + else: + test(isinstance(b1, bytes)) return (b1, b1) def opByteString2(self, b1, current=None): @@ -52,9 +55,15 @@ class CustomI(Test.Custom): return (s1, s1) def sendS(self, val, current=None): - test(isinstance(val.b1, str)) + if sys.version_info[0] == 2: + test(isinstance(val.b1, str)) + else: + test(isinstance(val.b1, bytes)) test(isinstance(val.b2, list)) - test(isinstance(val.b3, str)) + if sys.version_info[0] == 2: + test(isinstance(val.b3, str)) + else: + test(isinstance(val.b3, bytes)) test(isinstance(val.b4, list)) test(isinstance(val.s1, list)) test(isinstance(val.s2, tuple)) @@ -62,9 +71,15 @@ class CustomI(Test.Custom): test(isinstance(val.s4, list)) def sendC(self, val, current=None): - test(isinstance(val.b1, str)) + if sys.version_info[0] == 2: + test(isinstance(val.b1, str)) + else: + test(isinstance(val.b1, bytes)) test(isinstance(val.b2, list)) - test(isinstance(val.b3, str)) + if sys.version_info[0] == 2: + test(isinstance(val.b3, str)) + else: + test(isinstance(val.b3, bytes)) test(isinstance(val.b4, list)) test(isinstance(val.s1, list)) test(isinstance(val.s2, tuple)) |