Python: Ice.Value implementation

43 files changed, 111 insertions, 109 deletions

diff --git a/python/test/Ice/acm/TestI.py b/python/test/Ice/acm/TestI.py
index a54e13621bb..10565ca9540 100644
--- a/python/test/Ice/acm/TestI.py
+++ b/python/test/Ice/acm/TestI.py
@@ -9,7 +9,7 @@
 
 import Ice, Test, threading
 
-class RemoteCommunicatorI(Test.RemoteCommunicator):
+class RemoteCommunicatorI(Test._RemoteCommunicatorDisp):
     def createObjectAdapter(self, timeout, close, heartbeat, current=None):
         com = current.adapter.getCommunicator()
         properties = com.getProperties()
@@ -29,7 +29,7 @@ class RemoteCommunicatorI(Test.RemoteCommunicator):
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
-class RemoteObjectAdapterI(Test.RemoteObjectAdapter):
+class RemoteObjectAdapterI(Test._RemoteObjectAdapterDisp):
     def __init__(self, adapter):
         self._adapter = adapter
         self._testIntf = Test.TestIntfPrx.uncheckedCast(adapter.add(TestIntfI(),
@@ -51,7 +51,7 @@ class RemoteObjectAdapterI(Test.RemoteObjectAdapter):
         except Ice.ObjectAdapterDeactivatedException:
             pass
 
-class TestIntfI(Test.TestIntf):
+class TestIntfI(Test._TestIntfDisp):
     def __init__(self):
         self.m = threading.Condition()
 
diff --git a/python/test/Ice/adapterDeactivation/TestI.py b/python/test/Ice/adapterDeactivation/TestI.py
index 6bbe518e2ea..4ba3f2b07d7 100644
--- a/python/test/Ice/adapterDeactivation/TestI.py
+++ b/python/test/Ice/adapterDeactivation/TestI.py
@@ -14,7 +14,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
     def transient(self, current=None):
         communicator = current.adapter.getCommunicator()
         adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999")
diff --git a/python/test/Ice/admin/TestI.py b/python/test/Ice/admin/TestI.py
index c040ffbef59..b3667154c4e 100644
--- a/python/test/Ice/admin/TestI.py
+++ b/python/test/Ice/admin/TestI.py
@@ -13,11 +13,11 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class TestFacetI(Test.TestFacet):
+class TestFacetI(Test._TestFacetDisp):
     def op(self, current = None):
         return
 
-class RemoteCommunicatorI(Test.RemoteCommunicator, Ice.PropertiesAdminUpdateCallback):
+class RemoteCommunicatorI(Test._RemoteCommunicatorDisp, Ice.PropertiesAdminUpdateCallback):
     def __init__(self, communicator):
         self.communicator = communicator
         self.called = False
@@ -61,7 +61,7 @@ class RemoteCommunicatorI(Test.RemoteCommunicator, Ice.PropertiesAdminUpdateCall
             self.called = True
             self.m.notify()
 
-class RemoteCommunicatorFactoryI(Test.RemoteCommunicatorFactory):
+class RemoteCommunicatorFactoryI(Test._RemoteCommunicatorFactoryDisp):
 
     def createCommunicator(self, props, current = None):
         #
diff --git a/python/test/Ice/ami/AllTests.py b/python/test/Ice/ami/AllTests.py
index 7675ee8d4fb..549915ee12e 100644
--- a/python/test/Ice/ami/AllTests.py
+++ b/python/test/Ice/ami/AllTests.py
@@ -446,13 +446,13 @@ def allTests(communicator, collocated):
     cookie = 5
     cbWC = ResponseCallbackWC(cookie)
 
-    p.begin_ice_isA(Test.TestIntf.ice_staticId(), cb.isA, cb.ex)
+    p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), cb.isA, cb.ex)
     cb.check()
-    p.begin_ice_isA(Test.TestIntf.ice_staticId(), lambda r: cbWC.isA(r, cookie), lambda ex: cbWC.ex(ex, cookie))
+    p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), lambda r: cbWC.isA(r, cookie), lambda ex: cbWC.ex(ex, cookie))
     cbWC.check()
-    p.begin_ice_isA(Test.TestIntf.ice_staticId(), cb.isA, cb.ex, context=ctx)
+    p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), cb.isA, cb.ex, context=ctx)
     cb.check()
-    p.begin_ice_isA(Test.TestIntf.ice_staticId(), lambda r: cbWC.isA(r, cookie), lambda ex: cbWC.ex(ex, cookie),
+    p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), lambda r: cbWC.isA(r, cookie), lambda ex: cbWC.ex(ex, cookie),
                     context=ctx)
     cbWC.check()
 
@@ -563,9 +563,9 @@ def allTests(communicator, collocated):
     cookie = 5
     cbWC = ExceptionCallbackWC(cookie)
 
-    i.begin_ice_isA(Test.TestIntf.ice_staticId(), cb.response, cb.ex)
+    i.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), cb.response, cb.ex)
     cb.check()
-    i.begin_ice_isA(Test.TestIntf.ice_staticId(), lambda b: cbWC.response(b, cookie), lambda ex: cbWC.ex(ex, cookie))
+    i.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), lambda b: cbWC.response(b, cookie), lambda ex: cbWC.ex(ex, cookie))
     cbWC.check()
 
     i.begin_ice_ping(cb.response, cb.ex)
@@ -604,8 +604,8 @@ def allTests(communicator, collocated):
     cbWC = ExceptionCallbackWC(cookie)
 
     # Ensures no exception is called when response is received.
-    p.begin_ice_isA(Test.TestIntf.ice_staticId(), cb.nullResponse, cb.noEx)
-    p.begin_ice_isA(Test.TestIntf.ice_staticId(), lambda b: cbWC.nullResponse(b, cookie),
+    p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), cb.nullResponse, cb.noEx)
+    p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), lambda b: cbWC.nullResponse(b, cookie),
                     lambda ex: cbWC.noEx(ex, cookie))
     p.begin_op(cb.nullResponse, cb.noEx)
     p.begin_op(lambda: cbWC.nullResponse(cookie), lambda ex: cbWC.noEx(ex, cookie))
@@ -1220,9 +1220,9 @@ def allTestsFuture(communicator, collocated):
     ctx = {}
     cb = FutureDoneCallback()
 
-    p.ice_isAAsync(Test.TestIntf.ice_staticId()).add_done_callback(cb.isA)
+    p.ice_isAAsync(Test._TestIntfDisp.ice_staticId()).add_done_callback(cb.isA)
     cb.check()
-    p.ice_isAAsync(Test.TestIntf.ice_staticId(), ctx).add_done_callback(cb.isA)
+    p.ice_isAAsync(Test._TestIntfDisp.ice_staticId(), ctx).add_done_callback(cb.isA)
     cb.check()
 
     p.ice_pingAsync().add_done_callback(cb.ping)
@@ -1303,7 +1303,7 @@ def allTestsFuture(communicator, collocated):
     i = Test.TestIntfPrx.uncheckedCast(p.ice_adapterId("dummy"))
     cb = FutureExceptionCallback()
 
-    i.ice_isAAsync(Test.TestIntf.ice_staticId()).add_done_callback(cb.ex)
+    i.ice_isAAsync(Test._TestIntfDisp.ice_staticId()).add_done_callback(cb.ex)
     cb.check()
 
     i.ice_pingAsync().add_done_callback(cb.ex)
@@ -1330,7 +1330,7 @@ def allTestsFuture(communicator, collocated):
     cb = FutureExceptionCallback()
 
     # Ensures no exception is set when response is received.
-    p.ice_isAAsync(Test.TestIntf.ice_staticId()).add_done_callback(cb.noEx)
+    p.ice_isAAsync(Test._TestIntfDisp.ice_staticId()).add_done_callback(cb.noEx)
     p.opAsync().add_done_callback(cb.noEx)
 
     # If response is a user exception, it should be received.
diff --git a/python/test/Ice/ami/TestI.py b/python/test/Ice/ami/TestI.py
index f37bd47f806..3770a2c6101 100644
--- a/python/test/Ice/ami/TestI.py
+++ b/python/test/Ice/ami/TestI.py
@@ -9,7 +9,7 @@
 
 import Ice, Test, threading
 
-class TestIntfI(Test.TestIntf):
+class TestIntfI(Test._TestIntfDisp):
     def __init__(self):
         self._cond = threading.Condition()
         self._batchCount = 0
@@ -52,7 +52,7 @@ class TestIntfI(Test.TestIntf):
     def supportsFunctionalTests(self, current=None):
         return False
 
-class TestIntfControllerI(Test.TestIntfController):
+class TestIntfControllerI(Test._TestIntfControllerDisp):
     def __init__(self, adapter):
         self._adapter = adapter
 
diff --git a/python/test/Ice/binding/TestI.py b/python/test/Ice/binding/TestI.py
index a707b83f191..433865b223a 100644
--- a/python/test/Ice/binding/TestI.py
+++ b/python/test/Ice/binding/TestI.py
@@ -9,7 +9,7 @@
 
 import Ice, Test
 
-class RemoteCommunicatorI(Test.RemoteCommunicator):
+class RemoteCommunicatorI(Test._RemoteCommunicatorDisp):
 
     def __init__(self):
         self._nextPort = 10001
@@ -32,7 +32,7 @@ class RemoteCommunicatorI(Test.RemoteCommunicator):
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
-class RemoteObjectAdapterI(Test.RemoteObjectAdapter):
+class RemoteObjectAdapterI(Test._RemoteObjectAdapterDisp):
     def __init__(self, adapter):
         self._adapter = adapter
         self._testIntf = Test.TestIntfPrx.uncheckedCast(self._adapter.add(TestI(), Ice.stringToIdentity("test")))
@@ -47,6 +47,6 @@ class RemoteObjectAdapterI(Test.RemoteObjectAdapter):
         except Ice.ObjectAdapterDeactivatedException:
             pass
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
     def getAdapterName(self, current=None):
         return current.adapter.getName()
diff --git a/python/test/Ice/blobject/RouterI.py b/python/test/Ice/blobject/RouterI.py
index 7b07b36e1da..34767436317 100644
--- a/python/test/Ice/blobject/RouterI.py
+++ b/python/test/Ice/blobject/RouterI.py
@@ -131,7 +131,7 @@ class ServantLocatorI(Ice.ServantLocator):
     def deactivate(self, s):
         pass
 
-class RouterI(Ice.Router):
+class RouterI(Ice._RouterDisp):
     def __init__(self, communicator, sync):
         self._adapter = communicator.createObjectAdapterWithEndpoints("forward", "default -h 127.0.0.1")
         if sync:
diff --git a/python/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py
index 491f0ba9d8e..cd02c163c36 100755
--- a/python/test/Ice/blobject/Server.py
+++ b/python/test/Ice/blobject/Server.py
@@ -15,7 +15,7 @@ import Ice
 Ice.loadSlice('Test.ice')
 import Test
 
-class TestI(Test.Hello):
+class TestI(Test._HelloDisp):
     def sayHello(self, delay, current=None):
         if delay != 0:
             time.sleep(delay / 1000.0)
diff --git a/python/test/Ice/checksum/Server.py b/python/test/Ice/checksum/Server.py
index f2a074ad219..990de16608e 100755
--- a/python/test/Ice/checksum/Server.py
+++ b/python/test/Ice/checksum/Server.py
@@ -19,7 +19,7 @@ if not slice_dir:
 Ice.loadSlice("'-I" + slice_dir + "' --checksum Test.ice STypes.ice")
 import Test
 
-class ChecksumI(Test.Checksum):
+class ChecksumI(Test._ChecksumDisp):
     def getSliceChecksums(self, current=None):
         return Ice.sliceChecksums
 
diff --git a/python/test/Ice/custom/Server.py b/python/test/Ice/custom/Server.py
index 12621d40ca9..0c118c80344 100755
--- a/python/test/Ice/custom/Server.py
+++ b/python/test/Ice/custom/Server.py
@@ -18,7 +18,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class CustomI(Test.Custom):
+class CustomI(Test._CustomDisp):
     def opByteString1(self, b1, current=None):
         if sys.version_info[0] == 2:
             test(isinstance(b1, str))
diff --git a/python/test/Ice/defaultServant/MyObjectI.py b/python/test/Ice/defaultServant/MyObjectI.py
index dd102d2c7de..586bffeb41f 100644
--- a/python/test/Ice/defaultServant/MyObjectI.py
+++ b/python/test/Ice/defaultServant/MyObjectI.py
@@ -9,7 +9,7 @@
 
 import Ice, Test
 
-class MyObjectI(Test.MyObject):
+class MyObjectI(Test._MyObjectDisp):
     def ice_ping(self, current=None):
         name = current.id.name
 
diff --git a/python/test/Ice/enums/Server.py b/python/test/Ice/enums/Server.py
index 40cc8eb8d7f..299e1196301 100755
--- a/python/test/Ice/enums/Server.py
+++ b/python/test/Ice/enums/Server.py
@@ -18,7 +18,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class TestIntfI(Test.TestIntf):
+class TestIntfI(Test._TestIntfDisp):
     def opByte(self, b1, current=None):
         return (b1, b1)
 
diff --git a/python/test/Ice/exceptions/AllTests.py b/python/test/Ice/exceptions/AllTests.py
index 3c13e06f24c..5672c896d85 100644
--- a/python/test/Ice/exceptions/AllTests.py
+++ b/python/test/Ice/exceptions/AllTests.py
@@ -13,7 +13,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class EmptyI(Test.Empty):
+class EmptyI(Test._EmptyDisp):
     pass
 
 class ServantLocatorI(Ice.ServantLocator):
diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py
index 21238afdcf8..999a41115c8 100755
--- a/python/test/Ice/exceptions/ServerAMD.py
+++ b/python/test/Ice/exceptions/ServerAMD.py
@@ -23,7 +23,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class ThrowerI(Test.Thrower):
+class ThrowerI(Test._ThrowerDisp):
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
diff --git a/python/test/Ice/exceptions/TestI.py b/python/test/Ice/exceptions/TestI.py
index ec32708df63..8424a790063 100644
--- a/python/test/Ice/exceptions/TestI.py
+++ b/python/test/Ice/exceptions/TestI.py
@@ -9,7 +9,7 @@
 
 import Ice, Test, array, sys
 
-class ThrowerI(Test.Thrower):
+class ThrowerI(Test._ThrowerDisp):
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
diff --git a/python/test/Ice/facets/AllTests.py b/python/test/Ice/facets/AllTests.py
index 4f804da33f7..97a6fd34e53 100644
--- a/python/test/Ice/facets/AllTests.py
+++ b/python/test/Ice/facets/AllTests.py
@@ -13,7 +13,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class EmptyI(Test.Empty):
+class EmptyI(Test._EmptyDisp):
     pass
 
 def allTests(communicator):
diff --git a/python/test/Ice/facets/TestI.py b/python/test/Ice/facets/TestI.py
index 3d228e4d568..de1a73f4b6e 100644
--- a/python/test/Ice/facets/TestI.py
+++ b/python/test/Ice/facets/TestI.py
@@ -9,31 +9,31 @@
 
 import Test
 
-class AI(Test.A):
+class AI(Test._ADisp):
     def callA(self, current=None):
         return "A"
 
-class BI(Test.B, AI):
+class BI(Test._BDisp, AI):
     def callB(self, current=None):
         return "B"
 
-class CI(Test.C, AI):
+class CI(Test._CDisp, AI):
     def callC(self, current=None):
         return "C"
 
-class DI(Test.D, BI, CI):
+class DI(Test._DDisp, BI, CI):
     def callD(self, current=None):
         return "D"
 
-class EI(Test.E):
+class EI(Test._EDisp):
     def callE(self, current=None):
         return "E"
 
-class FI(Test.F, EI):
+class FI(Test._FDisp, EI):
     def callF(self, current=None):
         return "F"
 
-class GI(Test.G):
+class GI(Test._GDisp):
     def __init__(self, communicator):
         self._communicator = communicator
 
@@ -43,7 +43,7 @@ class GI(Test.G):
     def callG(self, current=None):
         return "G"
 
-class HI(Test.H, GI):
+class HI(Test._HDisp, GI):
     def __init__(self, communicator):
         GI.__init__(self, communicator)
 
diff --git a/python/test/Ice/faultTolerance/Server.py b/python/test/Ice/faultTolerance/Server.py
index 6e4b6fe0fc4..6185f4e23ac 100755
--- a/python/test/Ice/faultTolerance/Server.py
+++ b/python/test/Ice/faultTolerance/Server.py
@@ -17,7 +17,7 @@ import Test
 def usage(n):
     sys.stderr.write("Usage: " + n + " port\n")
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
diff --git a/python/test/Ice/info/TestI.py b/python/test/Ice/info/TestI.py
index 2325156db20..9bdef8847fe 100644
--- a/python/test/Ice/info/TestI.py
+++ b/python/test/Ice/info/TestI.py
@@ -22,7 +22,7 @@ def getIPConnectionInfo(info):
             return info
         info = info.underlying
 
-class MyDerivedClassI(Test.TestIntf):
+class MyDerivedClassI(Test._TestIntfDisp):
     def __init__(self):
         self.ctx = None
 
diff --git a/python/test/Ice/inheritance/TestI.py b/python/test/Ice/inheritance/TestI.py
index e5932e9b5d8..45672fe33b7 100644
--- a/python/test/Ice/inheritance/TestI.py
+++ b/python/test/Ice/inheritance/TestI.py
@@ -9,39 +9,39 @@
 
 import Ice, Test
 
-class CAI(Test.MA.CA):
+class CAI(Test.MA._CADisp):
     def caop(self, p, current=None):
         return p
 
-class CBI(Test.MB.CB, CAI):
+class CBI(Test.MB._CBDisp, CAI):
      def cbop(self, p, current=None):
         return p
 
-class CCI(Test.MA.CC, CBI):
+class CCI(Test.MA._CCDisp, CBI):
     def ccop(self, p, current=None):
         return p
 
-class IAI(Test.MA.IA):
+class IAI(Test.MA._IADisp):
     def iaop(self, p, current=None):
         return p
 
-class IB1I(Test.MB.IB1, IAI):
+class IB1I(Test.MB._IB1Disp, IAI):
     def ib1op(self, p, current=None):
         return p
 
-class IB2I(Test.MB.IB2, IAI):
+class IB2I(Test.MB._IB2Disp, IAI):
     def ib2op(self, p, current=None):
         return p
 
-class ICI(Test.MA.IC, IB1I, IB2I):
+class ICI(Test.MA._ICDisp, IB1I, IB2I):
     def icop(self, p, current=None):
         return p
 
-class CDI(Test.MA.CD, CCI, IB1I, IB2I):
+class CDI(Test.MA._CDDisp, CCI, IB1I, IB2I):
     def cdop(self, p, current=None):
         return p
 
-class InitialI(Test.Initial):
+class InitialI(Test._InitialDisp):
     def __init__(self, adapter):
         self._ca = Test.MA.CAPrx.uncheckedCast(adapter.addWithUUID(CAI()))
         self._cb = Test.MB.CBPrx.uncheckedCast(adapter.addWithUUID(CBI()))
diff --git a/python/test/Ice/location/AllTests.py b/python/test/Ice/location/AllTests.py
index 91519152101..dc0fb5afe5d 100644
--- a/python/test/Ice/location/AllTests.py
+++ b/python/test/Ice/location/AllTests.py
@@ -9,7 +9,7 @@
 
 import Ice, Test, sys
 
-class HelloI(Test.Hello):
+class HelloI(Test._HelloDisp):
     def sayHello(self, current=None):
         pass
 
diff --git a/python/test/Ice/location/Server.py b/python/test/Ice/location/Server.py
index b9e8f55e9ad..00e91ef3f47 100755
--- a/python/test/Ice/location/Server.py
+++ b/python/test/Ice/location/Server.py
@@ -19,7 +19,7 @@ if not slice_dir:
 Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
 import Test
 
-class ServerLocatorRegistry(Test.TestLocatorRegistry):
+class ServerLocatorRegistry(Test._TestLocatorRegistryDisp):
     def __init__(self):
         self._adapters = {}
         self._objects = {}
@@ -56,7 +56,7 @@ class ServerLocatorRegistry(Test.TestLocatorRegistry):
             raise Ice.ObjectNotFoundException()
         return self._objects[id]
 
-class ServerLocator(Test.TestLocator):
+class ServerLocator(Test._TestLocatorDisp):
 
     def __init__(self, registry, registryPrx):
         self._registry = registry
@@ -77,7 +77,7 @@ class ServerLocator(Test.TestLocator):
     def getRequestCount(self, current=None):
         return self._requestCount
 
-class ServerManagerI(Test.ServerManager):
+class ServerManagerI(Test._ServerManagerDisp):
     def __init__(self, registry, initData):
         self._registry = registry
         self._communicators = []
@@ -121,11 +121,11 @@ class ServerManagerI(Test.ServerManager):
             i.destroy()
         current.adapter.getCommunicator().shutdown()
 
-class HelloI(Test.Hello):
+class HelloI(Test._HelloDisp):
     def sayHello(self, current=None):
         pass
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
     def __init__(self, adapter, adapter2, registry):
         self._adapter1 = adapter
         self._adapter2 = adapter2
diff --git a/python/test/Ice/objects/AllTests.py b/python/test/Ice/objects/AllTests.py
index 8f129218307..4137f79e1f9 100644
--- a/python/test/Ice/objects/AllTests.py
+++ b/python/test/Ice/objects/AllTests.py
@@ -106,7 +106,7 @@ def allTests(communicator):
     i = initial.getI()
     test(i)
     j = initial.getJ()
-    test(isinstance(j, Test.J))
+    test(isinstance(j, TestI.JI))
     h = initial.getH()
     test(isinstance(h, Test.H))
     print("ok")
diff --git a/python/test/Ice/objects/TestI.py b/python/test/Ice/objects/TestI.py
index 7c0be3ae8dd..178182137a4 100644
--- a/python/test/Ice/objects/TestI.py
+++ b/python/test/Ice/objects/TestI.py
@@ -56,16 +56,18 @@ class FI(Test.F):
     def checkValues(self, current=None):
         return self._e1 != None and self._e1 == self.e2
 
-class II(Test.I):
-    pass
+class II(Ice.InterfaceByValue):
+    def __init__(self):
+        Ice.InterfaceByValue.__init__(self, "::Test::I")
 
-class JI(Test.J):
-    pass
+class JI(Ice.InterfaceByValue):
+    def __init__(self):
+        Ice.InterfaceByValue.__init__(self, "::Test::J")
 
 class HI(Test.H):
     pass
 
-class InitialI(Test.Initial):
+class InitialI(Test._InitialDisp):
     def __init__(self, adapter):
         self._adapter = adapter
         self._b1 = BI()
@@ -172,6 +174,6 @@ class InitialI(Test.Initial):
     def throwInnerSubEx(self, current=None):
         raise Test.Inner.Sub.Ex("Inner::Sub::Ex")
 
-class UnexpectedObjectExceptionTestI(Test.UnexpectedObjectExceptionTest):
+class UnexpectedObjectExceptionTestI(Test._UnexpectedObjectExceptionTestDisp):
     def op(self, current=None):
         return Test.AlsoEmpty()
diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py
index b2e96b39c96..cc950bb90ec 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.MyDerivedClass):
+class MyDerivedClassI(Test._MyDerivedClassDisp):
     def __init__(self):
         self.threads = []
         self.threadLock = threading.Lock()
@@ -46,19 +46,19 @@ class MyDerivedClassI(Test.MyDerivedClass):
 
     def ice_isA(self, id, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test.MyDerivedClass.ice_isA(self, id, current)
+        return Test._MyDerivedClassDisp.ice_isA(self, id, current)
 
     def ice_ping(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        Test.MyDerivedClass.ice_ping(self, current)
+        Test._MyDerivedClassDisp.ice_ping(self, current)
 
     def ice_ids(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test.MyDerivedClass.ice_ids(self, current)
+        return Test._MyDerivedClassDisp.ice_ids(self, current)
 
     def ice_id(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test.MyDerivedClass.ice_id(self, current)
+        return Test._MyDerivedClassDisp.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 87b1e0b21bc..81a07969058 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.MyDerivedClass):
+class MyDerivedClassI(Test._MyDerivedClassDisp):
     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.MyDerivedClass.ice_isA(self, id, current)
+        return Test._MyDerivedClassDisp.ice_isA(self, id, current)
 
     def ice_ping(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        Test.MyDerivedClass.ice_ping(self, current)
+        Test._MyDerivedClassDisp.ice_ping(self, current)
 
     def ice_ids(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test.MyDerivedClass.ice_ids(self, current)
+        return Test._MyDerivedClassDisp.ice_ids(self, current)
 
     def ice_id(self, current=None):
         test(current.mode == Ice.OperationMode.Nonmutating)
-        return Test.MyDerivedClass.ice_id(self, current)
+        return Test._MyDerivedClassDisp.ice_id(self, current)
 
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
diff --git a/python/test/Ice/optional/AllTests.py b/python/test/Ice/optional/AllTests.py
index 8219fe6f428..e08940b82de 100644
--- a/python/test/Ice/optional/AllTests.py
+++ b/python/test/Ice/optional/AllTests.py
@@ -75,13 +75,13 @@ def allTests(communicator):
     fs = Test.FixedStruct(78)
     vs = Test.VarStruct("hello")
     mo1 = Test.MultiOptional(15, True, 19, 78, 99, 5.5, 1.0, "test", Test.MyEnum.MyEnumMember, \
-                             Test.MultiOptionalPrx.uncheckedCast(communicator.stringToProxy("test")), \
+                             communicator.stringToProxy("test"), \
                              None, [5], ["test", "test2"], {4:3}, {"test":10}, fs, vs, [1], \
                              [Test.MyEnum.MyEnumMember, Test.MyEnum.MyEnumMember], \
                              [ fs ], [ vs ], [ oo1 ], \
-                             [ Test.OneOptionalPrx.uncheckedCast(communicator.stringToProxy("test")) ], \
+                             [ communicator.stringToProxy("test") ], \
                              {4:Test.MyEnum.MyEnumMember}, {4:fs}, {5:vs}, {5:Test.OneOptional(15)}, \
-                             {5:Test.OneOptionalPrx.uncheckedCast(communicator.stringToProxy("test"))}, \
+                             {5:communicator.stringToProxy("test")}, \
                              [False, True, False])
 
     test(mo1.a == 15)
@@ -93,7 +93,7 @@ def allTests(communicator):
     test(mo1.g == 1.0)
     test(mo1.h == "test")
     test(mo1.i == Test.MyEnum.MyEnumMember)
-    test(mo1.j == Test.MultiOptionalPrx.uncheckedCast(communicator.stringToProxy("test")))
+    test(mo1.j == communicator.stringToProxy("test"))
     test(mo1.k == None)
     test(mo1.bs == [5])
     test(mo1.ss == ["test", "test2"])
@@ -107,13 +107,13 @@ def allTests(communicator):
     test(mo1.fss[0] == Test.FixedStruct(78))
     test(mo1.vss[0] == Test.VarStruct("hello"))
     test(mo1.oos[0] == oo1)
-    test(mo1.oops[0] == Test.OneOptionalPrx.uncheckedCast(communicator.stringToProxy("test")))
+    test(mo1.oops[0] == communicator.stringToProxy("test"))
 
     test(mo1.ied[4] == Test.MyEnum.MyEnumMember)
     test(mo1.ifsd[4] == Test.FixedStruct(78))
     test(mo1.ivsd[5] == Test.VarStruct("hello"))
     test(mo1.iood[5].a == 15)
-    test(mo1.ioopd[5] == Test.OneOptionalPrx.uncheckedCast(communicator.stringToProxy("test")))
+    test(mo1.ioopd[5] == communicator.stringToProxy("test"))
 
     test(mo1.bos == [False, True, False])
 
@@ -188,13 +188,13 @@ def allTests(communicator):
     test(mo5.fss[0] == Test.FixedStruct(78))
     test(mo5.vss[0] == Test.VarStruct("hello"))
     test(mo5.oos[0].a == 15)
-    test(mo5.oops[0] == Test.OneOptionalPrx.uncheckedCast(communicator.stringToProxy("test")))
+    test(mo5.oops[0] == communicator.stringToProxy("test"))
 
     test(mo5.ied[4] == Test.MyEnum.MyEnumMember)
     test(mo5.ifsd[4] == Test.FixedStruct(78))
     test(mo5.ivsd[5] == Test.VarStruct("hello"))
     test(mo5.iood[5].a == 15)
-    test(mo5.ioopd[5] == Test.OneOptionalPrx.uncheckedCast(communicator.stringToProxy("test")))
+    test(mo5.ioopd[5] == communicator.stringToProxy("test"))
 
     test(mo5.bos == mo1.bos)
 
@@ -296,13 +296,13 @@ def allTests(communicator):
     test(mo9.fss is Ice.Unset)
     test(mo9.vss[0] == Test.VarStruct("hello"))
     test(mo9.oos is Ice.Unset)
-    test(mo9.oops[0] == Test.OneOptionalPrx.uncheckedCast(communicator.stringToProxy("test")))
+    test(mo9.oops[0] == communicator.stringToProxy("test"))
 
     test(mo9.ied[4] == Test.MyEnum.MyEnumMember)
     test(mo9.ifsd is Ice.Unset)
     test(mo9.ivsd[5] == Test.VarStruct("hello"))
     test(mo9.iood is Ice.Unset)
-    test(mo9.ioopd[5] == Test.OneOptionalPrx.uncheckedCast(communicator.stringToProxy("test")))
+    test(mo9.ioopd[5] == communicator.stringToProxy("test"))
 
     test(mo9.bos is Ice.Unset)
 
@@ -564,7 +564,7 @@ def allTests(communicator):
 
     (p2, p3) = initial.opOneOptionalProxy(Ice.Unset)
     test(p2 is Ice.Unset and p3 is Ice.Unset)
-    p1 = Test.OneOptionalPrx.uncheckedCast(communicator.stringToProxy("test"))
+    p1 = communicator.stringToProxy("test")
     (p2, p3) = initial.opOneOptionalProxy(p1)
     test(p2 == p1 and p3 == p1)
     f = initial.opOneOptionalProxyAsync(p1)
diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py
index 2db847e0b77..c9182ac46a7 100755
--- a/python/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
@@ -14,7 +14,7 @@ import Ice
 Ice.loadSlice('Test.ice')
 import Test
 
-class InitialI(Test.Initial):
+class InitialI(Test._InitialDisp):
 
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py
index d9cc9a9bb4a..65f84d2f269 100755
--- a/python/test/Ice/optional/ServerAMD.py
+++ b/python/test/Ice/optional/ServerAMD.py
@@ -14,7 +14,7 @@ import Ice
 Ice.loadSlice('TestAMD.ice')
 import Test
 
-class InitialI(Test.Initial):
+class InitialI(Test._InitialDisp):
 
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
diff --git a/python/test/Ice/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py
index b2f71d6fcfa..00a109ef7db 100755
--- a/python/test/Ice/proxy/ServerAMD.py
+++ b/python/test/Ice/proxy/ServerAMD.py
@@ -19,7 +19,7 @@ if not slice_dir:
 Ice.loadSlice("'-I" + slice_dir + "' TestAMD.ice")
 import Test
 
-class MyDerivedClassI(Test.MyDerivedClass):
+class MyDerivedClassI(Test._MyDerivedClassDisp):
     def __init__(self):
         self.ctx = None
 
@@ -34,7 +34,7 @@ class MyDerivedClassI(Test.MyDerivedClass):
 
     def ice_isA(self, s, current):
         self.ctx = current.ctx
-        return Test.MyDerivedClass.ice_isA(self, s, current)
+        return Test._MyDerivedClassDisp.ice_isA(self, s, current)
 
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
diff --git a/python/test/Ice/proxy/TestI.py b/python/test/Ice/proxy/TestI.py
index 2f73e6e63c2..c446127850f 100644
--- a/python/test/Ice/proxy/TestI.py
+++ b/python/test/Ice/proxy/TestI.py
@@ -10,7 +10,7 @@
 import Ice, Test
 import time
 
-class MyDerivedClassI(Test.MyDerivedClass):
+class MyDerivedClassI(Test._MyDerivedClassDisp):
     def __init__(self):
         self.ctx = None
 
@@ -25,4 +25,4 @@ class MyDerivedClassI(Test.MyDerivedClass):
 
     def ice_isA(self, s, current):
         self.ctx = current.ctx
-        return Test.MyDerivedClass.ice_isA(self, s, current)
+        return Test._MyDerivedClassDisp.ice_isA(self, s, current)
diff --git a/python/test/Ice/servantLocator/TestAMDI.py b/python/test/Ice/servantLocator/TestAMDI.py
index 219ce7f3ebc..53346a683df 100644
--- a/python/test/Ice/servantLocator/TestAMDI.py
+++ b/python/test/Ice/servantLocator/TestAMDI.py
@@ -14,7 +14,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
 
     def requestFailedException(self, current=None):
         return None
diff --git a/python/test/Ice/servantLocator/TestActivationAMDI.py b/python/test/Ice/servantLocator/TestActivationAMDI.py
index d9e2bedc2d0..7b685d1cd1b 100644
--- a/python/test/Ice/servantLocator/TestActivationAMDI.py
+++ b/python/test/Ice/servantLocator/TestActivationAMDI.py
@@ -11,7 +11,7 @@ import os, sys, traceback, time
 import Ice, Test, TestAMDI
 
 
-class TestActivationAMDI(Test.TestActivation):
+class TestActivationAMDI(Test._TestActivationDisp):
 
     def activateServantLocator(self, activate, current=None):
         if(activate):
diff --git a/python/test/Ice/servantLocator/TestActivationI.py b/python/test/Ice/servantLocator/TestActivationI.py
index 357d0a47c2d..295fbcebd16 100644
--- a/python/test/Ice/servantLocator/TestActivationI.py
+++ b/python/test/Ice/servantLocator/TestActivationI.py
@@ -11,7 +11,7 @@ import os, sys, traceback, time
 import Ice, Test, TestI
 
 
-class TestActivationI(Test.TestActivation):
+class TestActivationI(Test._TestActivationDisp):
 
     def activateServantLocator(self, activate, current=None):
         if activate:
diff --git a/python/test/Ice/servantLocator/TestI.py b/python/test/Ice/servantLocator/TestI.py
index b486be66982..f7743c370d1 100644
--- a/python/test/Ice/servantLocator/TestI.py
+++ b/python/test/Ice/servantLocator/TestI.py
@@ -14,7 +14,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
 
     def requestFailedException(self, current=None):
         pass
diff --git a/python/test/Ice/slicing/exceptions/AllTests.py b/python/test/Ice/slicing/exceptions/AllTests.py
index 5419f08e33e..abdd2c6a761 100644
--- a/python/test/Ice/slicing/exceptions/AllTests.py
+++ b/python/test/Ice/slicing/exceptions/AllTests.py
@@ -189,7 +189,7 @@ class Callback(CallbackBase):
             test(False)
         self.called()
 
-class RelayI(Test.Relay):
+class RelayI(Test._RelayDisp):
     def knownPreservedAsBase(self, current=None):
         ex = Test.KnownPreservedDerived()
         ex.b = "base"
diff --git a/python/test/Ice/slicing/exceptions/Server.py b/python/test/Ice/slicing/exceptions/Server.py
index 29834507e62..d77acfcccca 100755
--- a/python/test/Ice/slicing/exceptions/Server.py
+++ b/python/test/Ice/slicing/exceptions/Server.py
@@ -13,7 +13,7 @@ import Ice
 Ice.loadSlice('-I. --all ServerPrivate.ice')
 import Test
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
diff --git a/python/test/Ice/slicing/exceptions/ServerAMD.py b/python/test/Ice/slicing/exceptions/ServerAMD.py
index 6be6fbe5c03..8e821636a60 100755
--- a/python/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/python/test/Ice/slicing/exceptions/ServerAMD.py
@@ -14,7 +14,7 @@ import Ice
 Ice.loadSlice('-I. --all ServerPrivateAMD.ice')
 import Test
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
diff --git a/python/test/Ice/slicing/objects/AllTests.py b/python/test/Ice/slicing/objects/AllTests.py
index cc3a321d5fd..5fdc14ed197 100644
--- a/python/test/Ice/slicing/objects/AllTests.py
+++ b/python/test/Ice/slicing/objects/AllTests.py
@@ -76,7 +76,7 @@ class Callback(CallbackBase):
 
     def response_SUnknownAsObject11(self, f):
         o = f.result()
-        test(isinstance(o, Ice.UnknownSlicedObject))
+        test(isinstance(o, Ice.UnknownSlicedValue))
         test(o.unknownTypeId == "::Test::SUnknown")
         self.called()
 
@@ -532,7 +532,7 @@ def allTests(communicator):
     try:
         o = t.SUnknownAsObject()
         test(t.ice_getEncodingVersion() != Ice.Encoding_1_0)
-        test(isinstance(o, Ice.UnknownSlicedObject))
+        test(isinstance(o, Ice.UnknownSlicedValue))
         test(o.unknownTypeId == "::Test::SUnknown")
         t.checkSUnknown(o)
     except Ice.NoValueFactoryException:
diff --git a/python/test/Ice/slicing/objects/Server.py b/python/test/Ice/slicing/objects/Server.py
index 909e836bff4..a8048d2bf8d 100755
--- a/python/test/Ice/slicing/objects/Server.py
+++ b/python/test/Ice/slicing/objects/Server.py
@@ -18,7 +18,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
     def SBaseAsObject(self, current=None):
         sb = Test.SBase()
         sb.sb = "SBase.sb"
diff --git a/python/test/Ice/slicing/objects/ServerAMD.py b/python/test/Ice/slicing/objects/ServerAMD.py
index db617dd50e1..1f925613b6b 100755
--- a/python/test/Ice/slicing/objects/ServerAMD.py
+++ b/python/test/Ice/slicing/objects/ServerAMD.py
@@ -18,7 +18,7 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class TestI(Test.TestIntf):
+class TestI(Test._TestIntfDisp):
     def SBaseAsObject(self, current=None):
         sb = Test.SBase()
         sb.sb = "SBase.sb"
diff --git a/python/test/Ice/timeout/Server.py b/python/test/Ice/timeout/Server.py
index 4db8d04b78f..d607016e64e 100755
--- a/python/test/Ice/timeout/Server.py
+++ b/python/test/Ice/timeout/Server.py
@@ -29,7 +29,7 @@ class ActivateAdapterThread(threading.Thread):
         time.sleep(self._timeout / 1000.0)
         self._adapter.activate()
 
-class TimeoutI(Test.Timeout):
+class TimeoutI(Test._TimeoutDisp):
     def op(self, current=None):
         pass
 
diff --git a/python/test/Slice/escape/Client.py b/python/test/Slice/escape/Client.py
index e3da840e300..6305365602a 100755
--- a/python/test/Slice/escape/Client.py
+++ b/python/test/Slice/escape/Client.py
@@ -24,19 +24,19 @@ Ice.loadSlice('Clash.ice')
 
 import _and
 
-class delI(_and._del):
+class delI(_and._delDisp):
     def _elifAsync(self, _else, current=None):
         pass
 
-class execI(_and._exec):
+class execI(_and._execDisp):
     def _finally(self, current=None):
         assert current.operation == "finally"
 
-class forI(_and._for):
+class forI(_and._forDisp):
     def foo(self, _from, current=None):
         pass
 
-class ifI(_and._if):
+class ifI(_and._ifDisp):
     def _elifAsync(self, _else, current=None):
         pass
     def _finally(self, current=None):