summaryrefslogtreecommitdiff
path: root/python/test/Ice/operations/TestI.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2017-05-04 10:27:10 -0700
committerMark Spruiell <mes@zeroc.com>2017-05-04 10:27:10 -0700
commita03ae69b8b4c5ee3d26fa3d3bf64267a920d17a9 (patch)
treec865a871c5b36152708994068c7ce09c82abc1eb /python/test/Ice/operations/TestI.py
parentFixes ice_scheduler/ice_executor: (diff)
downloadice-a03ae69b8b4c5ee3d26fa3d3bf64267a920d17a9.tar.bz2
ice-a03ae69b8b4c5ee3d26fa3d3bf64267a920d17a9.tar.xz
ice-a03ae69b8b4c5ee3d26fa3d3bf64267a920d17a9.zip
ICE-7275 - Raise NotImplementedError in generated Python skeletons
ICE-7763 - Add support for marshaled-result in Python
Diffstat (limited to 'python/test/Ice/operations/TestI.py')
-rw-r--r--python/test/Ice/operations/TestI.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/python/test/Ice/operations/TestI.py b/python/test/Ice/operations/TestI.py
index 04ef6f468ed..c58e4729b48 100644
--- a/python/test/Ice/operations/TestI.py
+++ b/python/test/Ice/operations/TestI.py
@@ -82,7 +82,7 @@ class MyDerivedClassI(Test.MyDerivedClass):
p3 = p1[0:]
p3.extend(p2)
r = p1[0:]
- r.reverse();
+ r.reverse()
return (r, p3)
def opShortIntLongS(self, p1, p2, p3, current=None):
@@ -307,7 +307,7 @@ class MyDerivedClassI(Test.MyDerivedClass):
return current.ctx
def opDoubleMarshaling(self, p1, p2, current=None):
- d = 1278312346.0 / 13.0;
+ d = 1278312346.0 / 13.0
test(p1 == d)
for i in p2:
test(i == d)
@@ -370,19 +370,19 @@ class MyDerivedClassI(Test.MyDerivedClass):
return self.opStringLiterals(current)
def opMStruct1(self, current):
- return Test.Structure();
+ return Test.MyClass.OpMStruct1MarshaledResult(Test.Structure(), current)
def opMStruct2(self, p1, current):
- return (p1, p1);
+ return Test.MyClass.OpMStruct2MarshaledResult((p1, p1), current)
def opMSeq1(self, current):
- return ()
+ return Test.MyClass.OpMSeq1MarshaledResult((), current)
def opMSeq2(self, p1, current):
- return (p1, p1);
+ return Test.MyClass.OpMSeq2MarshaledResult((p1, p1), current)
def opMDict1(self, current):
- return {};
+ return Test.MyClass.OpMDict1MarshaledResult({}, current)
def opMDict2(self, p1, current):
- return (p1, p1);
+ return Test.MyClass.OpMDict2MarshaledResult((p1, p1), current)