ICE-7275 - Raise NotImplementedError in generated Python skeletons

ICE-7763 - Add support for marshaled-result in Python

6 files changed, 37 insertions, 37 deletions

diff --git a/python/test/Ice/objects/TestI.py b/python/test/Ice/objects/TestI.py
index 8ce0c271081..3745f509546 100644
--- a/python/test/Ice/objects/TestI.py
+++ b/python/test/Ice/objects/TestI.py
@@ -132,10 +132,10 @@ class InitialI(Test.Initial):
         return True
 
     def getMB(self, current):
-        return self._b1
+        return Test.Initial.GetMBMarshaledResult(self._b1, current)
 
     def getAMDMB(self, current):
-        return Ice.Future.completed(self._b1)
+        return Ice.Future.completed(Test.Initial.GetAMDMBMarshaledResult(self._b1, current))
 
     def getAll(self, current=None):
         self._b1.preMarshalInvoked = False
diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py
index 26375cfe2b3..43616a7bc17 100755
--- a/python/test/Ice/operations/ServerAMD.py
+++ b/python/test/Ice/operations/ServerAMD.py
@@ -426,22 +426,22 @@ class MyDerivedClassI(Test.MyDerivedClass):
         return self.opStringLiterals(current)
 
     def opMStruct1(self, current):
-        return Ice.Future.completed(Test.Structure())
+        return Ice.Future.completed(Test.MyClass.OpMStruct1MarshaledResult(Test.Structure(), current))
 
     def opMStruct2(self, p1, current):
-        return Ice.Future.completed((p1, p1))
+        return Ice.Future.completed(Test.MyClass.OpMStruct2MarshaledResult((p1, p1), current))
 
     def opMSeq1(self, current):
-        return Ice.Future.completed([])
+        return Ice.Future.completed(Test.MyClass.OpMSeq1MarshaledResult([], current))
 
     def opMSeq2(self, p1, current):
-        return Ice.Future.completed((p1, p1))
+        return Ice.Future.completed(Test.MyClass.OpMSeq2MarshaledResult((p1, p1), current))
 
     def opMDict1(self, current):
-        return Ice.Future.completed({})
+        return Ice.Future.completed(Test.MyClass.OpMDict1MarshaledResult({}, current))
 
     def opMDict2(self, p1, current):
-        return Ice.Future.completed((p1, p1))
+        return Ice.Future.completed(Test.MyClass.OpMDict2MarshaledResult((p1, p1), current))
 
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
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)
diff --git a/python/test/Ice/operations/Twoways.py b/python/test/Ice/operations/Twoways.py
index f68fd306c47..53489803ce5 100644
--- a/python/test/Ice/operations/Twoways.py
+++ b/python/test/Ice/operations/Twoways.py
@@ -16,7 +16,7 @@ def test(b):
 
 def twoways(communicator, p):
 
-    literals = p.opStringLiterals();
+    literals = p.opStringLiterals()
 
     test(Test.s0 == "\\")
     test(Test.s0 == Test.sw0)
@@ -1226,7 +1226,7 @@ def twoways(communicator, p):
     sdi1 = { "Hello!!": (1.1E10, 1.2E10, 1.3E10), "Goodbye": (1.4E10, 1.5E10) }
     sdi2 = { "": (1.6E10, 1.7E10) }
 
-    ro, do = p.opStringDoubleSD(sdi1, sdi2);
+    ro, do = p.opStringDoubleSD(sdi1, sdi2)
 
     test(len(do) == 1)
     test(len(do[""]) == 2)
@@ -1426,12 +1426,12 @@ def twoways(communicator, p):
     (p3, p2) = p.opMStruct2(p1)
     test(p2 == p1 and p3 == p1)
 
-    p.opMSeq1();
+    p.opMSeq1()
     p1 = ["test"]
     (p3, p2) = p.opMSeq2(p1)
-    test(p2[0] == "test" and p3[0] == "test");
+    test(p2[0] == "test" and p3[0] == "test")
 
-    p.opMDict1();
+    p.opMDict1()
 
     p1 = { "test": "test" }
     (p3, p2) = p.opMDict2(p1)
diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py
index daf66a2c91e..b1f3398cb56 100755
--- a/python/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
@@ -148,28 +148,28 @@ class InitialI(Test.Initial):
         pass
 
     def opMStruct1(self, current):
-        return Test.SmallStruct()
+        return Test.Initial.OpMStruct1MarshaledResult(Test.SmallStruct(), current)
 
     def opMStruct2(self, p1, current):
-        return (p1, p1)
+        return Test.Initial.OpMStruct2MarshaledResult((p1, p1), current)
 
     def opMSeq1(self, current):
-        return []
+        return Test.Initial.OpMSeq1MarshaledResult([], current)
 
     def opMSeq2(self, p1, current):
-        return (p1, p1)
+        return Test.Initial.OpMSeq2MarshaledResult((p1, p1), current)
 
     def opMDict1(self, current):
-        return {}
+        return Test.Initial.OpMDict1MarshaledResult({}, current)
 
     def opMDict2(self, p1, current):
-        return (p1, p1)
+        return Test.Initial.OpMDict2MarshaledResult((p1, p1), current)
 
     def opMG1(self, current):
-        return Test.G()
+        return Test.Initial.OpMG1MarshaledResult(Test.G(), current)
 
     def opMG2(self, p1, current):
-        return (p1, p1)
+        return Test.Initial.OpMG2MarshaledResult((p1, p1), current)
 
     def supportsRequiredParams(self, current=None):
         return False
diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py
index 91ec454acfa..075a7c08101 100755
--- a/python/test/Ice/optional/ServerAMD.py
+++ b/python/test/Ice/optional/ServerAMD.py
@@ -154,28 +154,28 @@ class InitialI(Test.Initial):
         return Ice.Future.completed(None)
 
     def opMStruct1(self, current):
-        return Ice.Future.completed(Test.SmallStruct())
+        return Ice.Future.completed(Test.Initial.OpMStruct1MarshaledResult(Test.SmallStruct(), current))
 
     def opMStruct2(self, p1, current):
-        return Ice.Future.completed((p1, p1))
+        return Ice.Future.completed(Test.Initial.OpMStruct2MarshaledResult((p1, p1), current))
 
     def opMSeq1(self, current):
-        return Ice.Future.completed([])
+        return Ice.Future.completed(Test.Initial.OpMSeq1MarshaledResult([], current))
 
     def opMSeq2(self, p1, current):
-        return Ice.Future.completed((p1, p1))
+        return Ice.Future.completed(Test.Initial.OpMSeq2MarshaledResult((p1, p1), current))
 
     def opMDict1(self, current):
-        return Ice.Future.completed({})
+        return Ice.Future.completed(Test.Initial.OpMDict1MarshaledResult({}, current))
 
     def opMDict2(self, p1, current):
-        return Ice.Future.completed((p1, p1))
+        return Ice.Future.completed(Test.Initial.OpMDict2MarshaledResult((p1, p1), current))
 
     def opMG1(self, current):
-        return Ice.Future.completed(Test.G())
+        return Ice.Future.completed(Test.Initial.OpMG1MarshaledResult(Test.G(), current))
 
     def opMG2(self, p1, current):
-        return Ice.Future.completed((p1, p1))
+        return Ice.Future.completed(Test.Initial.OpMG2MarshaledResult((p1, p1), current))
 
     def supportsRequiredParams(self, current=None):
         return Ice.Future.completed(False)