Fix (ICE-7684) - use Disp prefix only for class with operations skeletons

7 files changed, 18 insertions, 18 deletions

diff --git a/python/test/Ice/operations/OnewaysAMI.py b/python/test/Ice/operations/OnewaysAMI.py
index 79b31c73eb3..4ed393c49a1 100644
--- a/python/test/Ice/operations/OnewaysAMI.py
+++ b/python/test/Ice/operations/OnewaysAMI.py
@@ -45,7 +45,7 @@ def onewaysAMI(communicator, proxy):
     cb.check()
 
     try:
-        p.begin_ice_isA(Test._MyClassDisp.ice_staticId())
+        p.begin_ice_isA(Test.MyClass.ice_staticId())
         test(False)
     except RuntimeError:
         pass
diff --git a/python/test/Ice/operations/OnewaysFuture.py b/python/test/Ice/operations/OnewaysFuture.py
index b5caefbe744..9da67a45c7c 100644
--- a/python/test/Ice/operations/OnewaysFuture.py
+++ b/python/test/Ice/operations/OnewaysFuture.py
@@ -21,7 +21,7 @@ def onewaysFuture(communicator, proxy):
     f.sent()
 
     try:
-        p.ice_isAAsync(Test._MyClassDisp.ice_staticId())
+        p.ice_isAAsync(Test.MyClass.ice_staticId())
         test(False)
     except RuntimeError:
         pass
diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py
index 0b727f42970..a7cce20ca50 100755
--- a/python/test/Ice/operations/ServerAMD.py
+++ b/python/test/Ice/operations/ServerAMD.py
@@ -37,7 +37,7 @@ class FutureThread(threading.Thread):
         time.sleep(0.01)
         self.future.set_result(self.result)
 
-class MyDerivedClassI(Test._MyDerivedClassDisp):
+class MyDerivedClassI(Test.MyDerivedClass):
     def __init__(self):
         self.threads = []
         self.threadLock = threading.Lock()
@@ -46,19 +46,19 @@ class MyDerivedClassI(Test._MyDerivedClassDisp):
 
     def ice_isA(self, id, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test._MyDerivedClassDisp.ice_isA(self, id, current)
+        return Test.MyDerivedClass.ice_isA(self, id, current)
 
     def ice_ping(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        Test._MyDerivedClassDisp.ice_ping(self, current)
+        Test.MyDerivedClass.ice_ping(self, current)
 
     def ice_ids(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test._MyDerivedClassDisp.ice_ids(self, current)
+        return Test.MyDerivedClass.ice_ids(self, current)
 
     def ice_id(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test._MyDerivedClassDisp.ice_id(self, current)
+        return Test.MyDerivedClass.ice_id(self, current)
 
     def shutdown(self, current=None):
         with self.threadLock:
diff --git a/python/test/Ice/operations/TestI.py b/python/test/Ice/operations/TestI.py
index 0a3b39966ff..04ef6f468ed 100644
--- a/python/test/Ice/operations/TestI.py
+++ b/python/test/Ice/operations/TestI.py
@@ -13,26 +13,26 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class MyDerivedClassI(Test._MyDerivedClassDisp):
+class MyDerivedClassI(Test.MyDerivedClass):
     def __init__(self):
         self.lock = threading.Lock()
         self.opByteSOnewayCount = 0
 
     def ice_isA(self, id, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test._MyDerivedClassDisp.ice_isA(self, id, current)
+        return Test.MyDerivedClass.ice_isA(self, id, current)
 
     def ice_ping(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        Test._MyDerivedClassDisp.ice_ping(self, current)
+        Test.MyDerivedClass.ice_ping(self, current)
 
     def ice_ids(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test._MyDerivedClassDisp.ice_ids(self, current)
+        return Test.MyDerivedClass.ice_ids(self, current)
 
     def ice_id(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test._MyDerivedClassDisp.ice_id(self, current)
+        return Test.MyDerivedClass.ice_id(self, current)
 
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
diff --git a/python/test/Ice/operations/Twoways.py b/python/test/Ice/operations/Twoways.py
index 1e473884823..f68fd306c47 100644
--- a/python/test/Ice/operations/Twoways.py
+++ b/python/test/Ice/operations/Twoways.py
@@ -103,7 +103,7 @@ def twoways(communicator, p):
     #
     # ice_isA
     #
-    test(p.ice_isA(Test._MyClassDisp.ice_staticId()))
+    test(p.ice_isA(Test.MyClass.ice_staticId()))
 
     #
     # ice_ids
@@ -117,13 +117,13 @@ def twoways(communicator, p):
     #
     # ice_id
     #
-    test(p.ice_id() == Test._MyDerivedClassDisp.ice_staticId())
+    test(p.ice_id() == Test.MyDerivedClass.ice_staticId())
 
     #
     # Prx ice_staticId
     #
-    test(Test.MyClassPrx.ice_staticId() == Test._MyClassDisp.ice_staticId())
-    test(Test.MyDerivedClassPrx.ice_staticId() == Test._MyDerivedClassDisp.ice_staticId())
+    test(Test.MyClassPrx.ice_staticId() == Test.MyClass.ice_staticId())
+    test(Test.MyDerivedClassPrx.ice_staticId() == Test.MyDerivedClass.ice_staticId())
     test(Ice.ObjectPrx.ice_staticId() == Ice.Object.ice_staticId())
 
     #
diff --git a/python/test/Ice/operations/TwowaysAMI.py b/python/test/Ice/operations/TwowaysAMI.py
index 5f7cc1445c0..6f754f9e3e6 100644
--- a/python/test/Ice/operations/TwowaysAMI.py
+++ b/python/test/Ice/operations/TwowaysAMI.py
@@ -757,7 +757,7 @@ def twowaysAMI(communicator, p):
     cb.check()
 
     cb = Callback()
-    p.begin_ice_isA(Test._MyClassDisp.ice_staticId(), cb.isA, cb.exCB)
+    p.begin_ice_isA(Test.MyClass.ice_staticId(), cb.isA, cb.exCB)
     cb.check()
 
     cb = Callback()
diff --git a/python/test/Ice/operations/TwowaysFuture.py b/python/test/Ice/operations/TwowaysFuture.py
index 0b24cc7ac08..abc4c5aa77e 100644
--- a/python/test/Ice/operations/TwowaysFuture.py
+++ b/python/test/Ice/operations/TwowaysFuture.py
@@ -902,7 +902,7 @@ def twowaysFuture(communicator, p):
     f = p.ice_pingAsync()
     test(f.result() is None)
 
-    f = p.ice_isAAsync(Test._MyClassDisp.ice_staticId())
+    f = p.ice_isAAsync(Test.MyClass.ice_staticId())
     test(f.result())
 
     f = p.ice_idAsync()