Deprecate Communicator::stringToIdentity and identityToString

48 files changed, 114 insertions, 116 deletions

diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp
index 76b1b5e419c..72a5ddc12d8 100644
--- a/python/modules/IcePy/Operation.cpp
+++ b/python/modules/IcePy/Operation.cpp
@@ -3337,7 +3337,7 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con
     if(!method.get())
     {
         ostringstream ostr;
-        ostr << "servant for identity " << _communicator->identityToString(current.id)
+        ostr << "servant for identity " << identityToString(current.id)
              << " does not define operation `" << _op->dispatchName << "'";
         string str = ostr.str();
         PyErr_Warn(PyExc_RuntimeWarning, const_cast<char*>(str.c_str()));
@@ -3720,7 +3720,7 @@ IcePy::BlobjectUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*,
     if(!method.get())
     {
         ostringstream ostr;
-        ostr << "servant for identity " << communicator->identityToString(current.id)
+        ostr << "servant for identity " << identityToString(current.id)
              << " does not define operation `" << dispatchName << "'";
         string str = ostr.str();
         PyErr_Warn(PyExc_RuntimeWarning, const_cast<char*>(str.c_str()));
diff --git a/python/test/Ice/acm/Server.py b/python/test/Ice/acm/Server.py
index 4769e6de0bc..78f2486754b 100755
--- a/python/test/Ice/acm/Server.py
+++ b/python/test/Ice/acm/Server.py
@@ -22,7 +22,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     communicator.getProperties().setProperty("TestAdapter.ACM.Timeout", "0")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    id = communicator.stringToIdentity("communicator")
+    id = Ice.stringToIdentity("communicator")
     adapter.add(TestI.RemoteCommunicatorI(), id)
     adapter.activate()
 
diff --git a/python/test/Ice/acm/TestI.py b/python/test/Ice/acm/TestI.py
index 920cbd44c7e..a728dfce1b3 100644
--- a/python/test/Ice/acm/TestI.py
+++ b/python/test/Ice/acm/TestI.py
@@ -33,7 +33,7 @@ class RemoteObjectAdapterI(Test.RemoteObjectAdapter):
     def __init__(self, adapter):
         self._adapter = adapter
         self._testIntf = Test.TestIntfPrx.uncheckedCast(adapter.add(TestIntfI(),
-                                                        adapter.getCommunicator().stringToIdentity("test")))
+                                                        Ice.stringToIdentity("test")))
         adapter.activate()
 
     def getTestIntf(self, current=None):
diff --git a/python/test/Ice/admin/AllTests.py b/python/test/Ice/admin/AllTests.py
index e6ee6e196e0..685ec77ee9f 100644
--- a/python/test/Ice/admin/AllTests.py
+++ b/python/test/Ice/admin/AllTests.py
@@ -116,7 +116,7 @@ def allTests(communicator):
     init.properties.setProperty("Ice.Admin.Enabled", "1")
     com = Ice.initialize(init)
     test(com.getAdmin() == None)
-    identity = com.stringToIdentity("test-admin")
+    identity = Ice.stringToIdentity("test-admin")
     try:
         com.createAdmin(None, identity)
         test(False)
diff --git a/python/test/Ice/admin/Server.py b/python/test/Ice/admin/Server.py
index a28da94e27d..ebdd142b967 100644
--- a/python/test/Ice/admin/Server.py
+++ b/python/test/Ice/admin/Server.py
@@ -22,7 +22,7 @@ import Test, TestI
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     adapter = communicator.createObjectAdapter("TestAdapter");
-    ident = communicator.stringToIdentity("factory");
+    ident = Ice.stringToIdentity("factory");
     adapter.add(TestI.RemoteCommunicatorFactoryI(), ident);
     adapter.activate();
 
diff --git a/python/test/Ice/ami/Collocated.py b/python/test/Ice/ami/Collocated.py
index 689d7625686..062ff31f8fb 100755
--- a/python/test/Ice/ami/Collocated.py
+++ b/python/test/Ice/ami/Collocated.py
@@ -29,10 +29,10 @@ def run(args, communicator):
 
     testController = TestI.TestIntfControllerI(adapter)
 
-    adapter.add(TestI.TestIntfI(), communicator.stringToIdentity("test"))
+    adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test"))
     #adapter.activate() # Collocated test doesn't need to active the OA
     
-    adapter2.add(testController, communicator.stringToIdentity("testController"))
+    adapter2.add(testController, Ice.stringToIdentity("testController"))
     #adapter2.activate() # Collocated test doesn't need to active the OA
 
     AllTests.allTests(communicator, True)
diff --git a/python/test/Ice/ami/Server.py b/python/test/Ice/ami/Server.py
index 621f719d0bc..a1c51251af5 100755
--- a/python/test/Ice/ami/Server.py
+++ b/python/test/Ice/ami/Server.py
@@ -28,10 +28,10 @@ def run(args, communicator):
 
     testController = TestI.TestIntfControllerI(adapter)
 
-    adapter.add(TestI.TestIntfI(), communicator.stringToIdentity("test"))
+    adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test"))
     adapter.activate()
 
-    adapter2.add(testController, communicator.stringToIdentity("testController"))
+    adapter2.add(testController, Ice.stringToIdentity("testController"))
     adapter2.activate()
 
     communicator.waitForShutdown()
diff --git a/python/test/Ice/binding/Server.py b/python/test/Ice/binding/Server.py
index 41bfe2404ff..e86495fecc4 100755
--- a/python/test/Ice/binding/Server.py
+++ b/python/test/Ice/binding/Server.py
@@ -17,7 +17,7 @@ import Test, TestI
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    id = communicator.stringToIdentity("communicator")
+    id = Ice.stringToIdentity("communicator")
     adapter.add(TestI.RemoteCommunicatorI(), id)
     adapter.activate()
 
diff --git a/python/test/Ice/binding/TestI.py b/python/test/Ice/binding/TestI.py
index e5aebf4a66e..a707b83f191 100644
--- a/python/test/Ice/binding/TestI.py
+++ b/python/test/Ice/binding/TestI.py
@@ -35,7 +35,7 @@ class RemoteCommunicatorI(Test.RemoteCommunicator):
 class RemoteObjectAdapterI(Test.RemoteObjectAdapter):
     def __init__(self, adapter):
         self._adapter = adapter
-        self._testIntf = Test.TestIntfPrx.uncheckedCast(self._adapter.add(TestI(), adapter.getCommunicator().stringToIdentity("test")))
+        self._testIntf = Test.TestIntfPrx.uncheckedCast(self._adapter.add(TestI(), Ice.stringToIdentity("test")))
         self._adapter.activate()
 
     def getTestIntf(self, current=None):
diff --git a/python/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py
index a3123f43b69..9acab682de3 100755
--- a/python/test/Ice/blobject/Server.py
+++ b/python/test/Ice/blobject/Server.py
@@ -33,7 +33,7 @@ class TestI(Test.Hello):
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TestI(), communicator.stringToIdentity("test"))
+    adapter.add(TestI(), Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/checksum/Server.py b/python/test/Ice/checksum/Server.py
index 1d8c49494a4..0f323f7e077 100755
--- a/python/test/Ice/checksum/Server.py
+++ b/python/test/Ice/checksum/Server.py
@@ -30,7 +30,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = ChecksumI()
-    adapter.add(object, communicator.stringToIdentity("test"))
+    adapter.add(object, Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/custom/Server.py b/python/test/Ice/custom/Server.py
index c208c67b89f..46d1a70cda0 100755
--- a/python/test/Ice/custom/Server.py
+++ b/python/test/Ice/custom/Server.py
@@ -93,7 +93,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = CustomI()
-    adapter.add(object, communicator.stringToIdentity("test"))
+    adapter.add(object, Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/enums/Server.py b/python/test/Ice/enums/Server.py
index bc501d7541c..2c6c8292a16 100755
--- a/python/test/Ice/enums/Server.py
+++ b/python/test/Ice/enums/Server.py
@@ -50,7 +50,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestIntfI()
-    adapter.add(object, communicator.stringToIdentity("test"))
+    adapter.add(object, Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/exceptions/AllTests.py b/python/test/Ice/exceptions/AllTests.py
index 97d68ecabb0..5cab53dd6f4 100644
--- a/python/test/Ice/exceptions/AllTests.py
+++ b/python/test/Ice/exceptions/AllTests.py
@@ -172,7 +172,7 @@ class Callback(CallbackBase):
         try:
             raise ex
         except Ice.ObjectNotExistException as ex:
-            id = self._communicator.stringToIdentity("does not exist")
+            id = Ice.stringToIdentity("does not exist")
             test(ex.id == id)
         except:
             test(False)
@@ -222,29 +222,29 @@ def allTests(communicator):
     communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default")
     adapter = communicator.createObjectAdapter("TestAdapter1")
     obj = EmptyI()
-    adapter.add(obj, communicator.stringToIdentity("x"))
+    adapter.add(obj, Ice.stringToIdentity("x"))
     try:
-        adapter.add(obj, communicator.stringToIdentity("x"))
+        adapter.add(obj, Ice.stringToIdentity("x"))
         test(false)
     except Ice.AlreadyRegisteredException:
         pass
 
     try:
-        adapter.add(obj, communicator.stringToIdentity(""))
+        adapter.add(obj, Ice.stringToIdentity(""))
         test(false)
     except Ice.IllegalIdentityException as ex:
         test(ex.id.name == "")
 
     try:
-        adapter.add(None, communicator.stringToIdentity("x"))
+        adapter.add(None, Ice.stringToIdentity("x"))
         test(false)
     except Ice.IllegalServantException:
         pass
 
 
-    adapter.remove(communicator.stringToIdentity("x"))
+    adapter.remove(Ice.stringToIdentity("x"))
     try:
-        adapter.remove(communicator.stringToIdentity("x"))
+        adapter.remove(Ice.stringToIdentity("x"))
         test(false)
     except Ice.NotRegisteredException:
         pass
@@ -495,7 +495,7 @@ def allTests(communicator):
     sys.stdout.write("catching object not exist exception... ")
     sys.stdout.flush()
 
-    id = communicator.stringToIdentity("does not exist")
+    id = Ice.stringToIdentity("does not exist")
     try:
         thrower2 = Test.ThrowerPrx.uncheckedCast(thrower.ice_identity(id))
         thrower2.throwAasA(1)
@@ -664,7 +664,7 @@ def allTests(communicator):
     sys.stdout.write("catching object not exist exception with AMI mapping... ")
     sys.stdout.flush()
 
-    id = communicator.stringToIdentity("does not exist")
+    id = Ice.stringToIdentity("does not exist")
     thrower2 = Test.ThrowerPrx.uncheckedCast(thrower.ice_identity(id))
     cb = Callback(communicator)
     thrower2.begin_throwAasA(1, cb.response, cb.exception_AasAObjectNotExist)
diff --git a/python/test/Ice/exceptions/Collocated.py b/python/test/Ice/exceptions/Collocated.py
index 0f49dc62e87..b1dc368a161 100755
--- a/python/test/Ice/exceptions/Collocated.py
+++ b/python/test/Ice/exceptions/Collocated.py
@@ -25,7 +25,7 @@ def run(args, communicator):
     properties.setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI.ThrowerI()
-    adapter.add(object, communicator.stringToIdentity("thrower"))
+    adapter.add(object, Ice.stringToIdentity("thrower"))
     #adapter.activate() // Don't activate OA to ensure collocation is used.
 
     thrower = AllTests.allTests(communicator)
diff --git a/python/test/Ice/exceptions/Server.py b/python/test/Ice/exceptions/Server.py
index 560a2f06220..a3556e7f439 100755
--- a/python/test/Ice/exceptions/Server.py
+++ b/python/test/Ice/exceptions/Server.py
@@ -24,9 +24,9 @@ def run(args, communicator):
     adapter2 = communicator.createObjectAdapter("TestAdapter2")
     adapter3 = communicator.createObjectAdapter("TestAdapter3")
     object = TestI.ThrowerI()
-    adapter.add(object, communicator.stringToIdentity("thrower"))
-    adapter2.add(object, communicator.stringToIdentity("thrower"))
-    adapter3.add(object, communicator.stringToIdentity("thrower"))
+    adapter.add(object, Ice.stringToIdentity("thrower"))
+    adapter2.add(object, Ice.stringToIdentity("thrower"))
+    adapter3.add(object, Ice.stringToIdentity("thrower"))
     adapter.activate()
     adapter2.activate()
     adapter3.activate()
diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py
index 966ebd17618..ae11c454596 100755
--- a/python/test/Ice/exceptions/ServerAMD.py
+++ b/python/test/Ice/exceptions/ServerAMD.py
@@ -144,9 +144,9 @@ def run(args, communicator):
     adapter2 = communicator.createObjectAdapter("TestAdapter2")
     adapter3 = communicator.createObjectAdapter("TestAdapter3")
     object = ThrowerI()
-    adapter.add(object, communicator.stringToIdentity("thrower"))
-    adapter2.add(object, communicator.stringToIdentity("thrower"))
-    adapter3.add(object, communicator.stringToIdentity("thrower"))
+    adapter.add(object, Ice.stringToIdentity("thrower"))
+    adapter2.add(object, Ice.stringToIdentity("thrower"))
+    adapter3.add(object, Ice.stringToIdentity("thrower"))
     adapter.activate()
     adapter2.activate()
     adapter3.activate()
diff --git a/python/test/Ice/facets/AllTests.py b/python/test/Ice/facets/AllTests.py
index e6fa69e3d01..4f804da33f7 100644
--- a/python/test/Ice/facets/AllTests.py
+++ b/python/test/Ice/facets/AllTests.py
@@ -45,16 +45,16 @@ def allTests(communicator):
     communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default")
     adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter")
     obj = EmptyI()
-    adapter.add(obj, communicator.stringToIdentity("d"))
-    adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD")
+    adapter.add(obj, Ice.stringToIdentity("d"))
+    adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD")
     try:
-        adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD")
+        adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD")
         test(false)
     except Ice.AlreadyRegisteredException:
         pass
-    adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD")
+    adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD")
     try:
-        adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD")
+        adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD")
         test(false)
     except Ice.NotRegisteredException:
         pass
@@ -64,22 +64,22 @@ def allTests(communicator):
     sys.stdout.flush()
     obj1 = EmptyI()
     obj2 = EmptyI()
-    adapter.addFacet(obj1, communicator.stringToIdentity("id1"), "f1")
-    adapter.addFacet(obj2, communicator.stringToIdentity("id1"), "f2")
+    adapter.addFacet(obj1, Ice.stringToIdentity("id1"), "f1")
+    adapter.addFacet(obj2, Ice.stringToIdentity("id1"), "f2")
     obj3 = EmptyI()
-    adapter.addFacet(obj1, communicator.stringToIdentity("id2"), "f1")
-    adapter.addFacet(obj2, communicator.stringToIdentity("id2"), "f2")
-    adapter.addFacet(obj3, communicator.stringToIdentity("id2"), "")
-    fm = adapter.removeAllFacets(communicator.stringToIdentity("id1"))
+    adapter.addFacet(obj1, Ice.stringToIdentity("id2"), "f1")
+    adapter.addFacet(obj2, Ice.stringToIdentity("id2"), "f2")
+    adapter.addFacet(obj3, Ice.stringToIdentity("id2"), "")
+    fm = adapter.removeAllFacets(Ice.stringToIdentity("id1"))
     test(len(fm) == 2)
     test(fm["f1"] == obj1)
     test(fm["f2"] == obj2)
     try:
-        adapter.removeAllFacets(communicator.stringToIdentity("id1"))
+        adapter.removeAllFacets(Ice.stringToIdentity("id1"))
         test(false)
     except Ice.NotRegisteredException:
         pass
-    fm = adapter.removeAllFacets(communicator.stringToIdentity("id2"))
+    fm = adapter.removeAllFacets(Ice.stringToIdentity("id2"))
     test(len(fm) == 3)
     test(fm["f1"] == obj1)
     test(fm["f2"] == obj2)
diff --git a/python/test/Ice/facets/Collocated.py b/python/test/Ice/facets/Collocated.py
index 18e25a4baf0..5936768fbdc 100755
--- a/python/test/Ice/facets/Collocated.py
+++ b/python/test/Ice/facets/Collocated.py
@@ -18,12 +18,12 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     d = TestI.DI()
-    adapter.add(d, communicator.stringToIdentity("d"))
-    adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD")
+    adapter.add(d, Ice.stringToIdentity("d"))
+    adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD")
     f = TestI.FI()
-    adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF")
+    adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF")
     h = TestI.HI(communicator)
-    adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH")
+    adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH")
 
     #adapter.activate() // Don't activate OA to ensure collocation is used.
 
diff --git a/python/test/Ice/facets/Server.py b/python/test/Ice/facets/Server.py
index 0c9b334d1b7..e00238e0834 100755
--- a/python/test/Ice/facets/Server.py
+++ b/python/test/Ice/facets/Server.py
@@ -18,12 +18,12 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     d = TestI.DI()
-    adapter.add(d, communicator.stringToIdentity("d"))
-    adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD")
+    adapter.add(d, Ice.stringToIdentity("d"))
+    adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD")
     f = TestI.FI()
-    adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF")
+    adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF")
     h = TestI.HI(communicator)
-    adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH")
+    adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH")
 
     adapter.activate()
     communicator.waitForShutdown()
diff --git a/python/test/Ice/faultTolerance/Server.py b/python/test/Ice/faultTolerance/Server.py
index 4698f60e378..fd9b0f4096c 100755
--- a/python/test/Ice/faultTolerance/Server.py
+++ b/python/test/Ice/faultTolerance/Server.py
@@ -54,7 +54,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", endpts)
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI()
-    adapter.add(object, communicator.stringToIdentity("test"))
+    adapter.add(object, Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/info/Server.py b/python/test/Ice/info/Server.py
index 9b516c665f8..1c6057ce26c 100755
--- a/python/test/Ice/info/Server.py
+++ b/python/test/Ice/info/Server.py
@@ -22,7 +22,7 @@ import Test, TestI
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test"))
+    adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/inheritance/Collocated.py b/python/test/Ice/inheritance/Collocated.py
index c87c477ade1..cca4200f26e 100755
--- a/python/test/Ice/inheritance/Collocated.py
+++ b/python/test/Ice/inheritance/Collocated.py
@@ -18,7 +18,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI.InitialI(adapter)
-    adapter.add(object, communicator.stringToIdentity("initial"))
+    adapter.add(object, Ice.stringToIdentity("initial"))
     #adapter.activate() // Don't activate OA to ensure collocation is used.
 
     AllTests.allTests(communicator)
diff --git a/python/test/Ice/inheritance/Server.py b/python/test/Ice/inheritance/Server.py
index 2aa29b366ee..3415ad4519d 100755
--- a/python/test/Ice/inheritance/Server.py
+++ b/python/test/Ice/inheritance/Server.py
@@ -18,7 +18,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI.InitialI(adapter)
-    adapter.add(object, communicator.stringToIdentity("initial"))
+    adapter.add(object, Ice.stringToIdentity("initial"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/location/AllTests.py b/python/test/Ice/location/AllTests.py
index 91519152101..bf0a378b85f 100644
--- a/python/test/Ice/location/AllTests.py
+++ b/python/test/Ice/location/AllTests.py
@@ -248,7 +248,7 @@ def allTests(communicator, ref):
     registry.addObject(adapter.add(HelloI(), id));
     adapter.activate();
 
-    helloPrx = Test.HelloPrx.checkedCast(communicator.stringToProxy(communicator.identityToString(id)));
+    helloPrx = Test.HelloPrx.checkedCast(communicator.stringToProxy(Ice.identityToString(id)));
     test(not helloPrx.ice_getConnection());
 
     adapter.deactivate();
diff --git a/python/test/Ice/location/Server.py b/python/test/Ice/location/Server.py
index 0ec827f3afc..24cd82df2d8 100755
--- a/python/test/Ice/location/Server.py
+++ b/python/test/Ice/location/Server.py
@@ -109,9 +109,9 @@ class ServerManagerI(Test.ServerManager):
         adapter2.setLocator(Ice.LocatorPrx.uncheckedCast(locator))
 
         object = TestI(adapter, adapter2, self._registry)
-        self._registry.addObject(adapter.add(object, communicator.stringToIdentity("test")))
-        self._registry.addObject(adapter.add(object, communicator.stringToIdentity("test2")))
-        adapter.add(object, communicator.stringToIdentity("test3"))
+        self._registry.addObject(adapter.add(object, Ice.stringToIdentity("test")))
+        self._registry.addObject(adapter.add(object, Ice.stringToIdentity("test2")))
+        adapter.add(object, Ice.stringToIdentity("test3"))
 
         adapter.activate()
         adapter2.activate()
@@ -130,19 +130,19 @@ class TestI(Test.TestIntf):
         self._adapter1 = adapter
         self._adapter2 = adapter2
         self._registry = registry
-        self._registry.addObject(self._adapter1.add(HelloI(), communicator.stringToIdentity("hello")))
+        self._registry.addObject(self._adapter1.add(HelloI(), Ice.stringToIdentity("hello")))
 
     def shutdown(self, current=None):
         self._adapter1.getCommunicator().shutdown()
 
     def getHello(self, current=None):
-        return Test.HelloPrx.uncheckedCast(self._adapter1.createIndirectProxy(communicator.stringToIdentity("hello")))
+        return Test.HelloPrx.uncheckedCast(self._adapter1.createIndirectProxy(Ice.stringToIdentity("hello")))
 
     def getReplicatedHello(self, current=None):
-        return Test.HelloPrx.uncheckedCast(self._adapter1.createProxy(communicator.stringToIdentity("hello")))
+        return Test.HelloPrx.uncheckedCast(self._adapter1.createProxy(Ice.stringToIdentity("hello")))
 
     def migrateHello(self, current=None):
-        id = communicator.stringToIdentity("hello")
+        id = Ice.stringToIdentity("hello")
         try:
             self._registry.addObject(self._adapter2.add(self._adapter1.remove(id), id))
         except Ice.NotRegisteredException:
@@ -166,14 +166,14 @@ def run(args, communicator, initData):
     # 'servers' created with the server manager interface.
     #
     registry = ServerLocatorRegistry()
-    registry.addObject(adapter.createProxy(communicator.stringToIdentity("ServerManager")))
+    registry.addObject(adapter.createProxy(Ice.stringToIdentity("ServerManager")))
     object = ServerManagerI(registry, initData)
-    adapter.add(object, communicator.stringToIdentity("ServerManager"))
+    adapter.add(object, Ice.stringToIdentity("ServerManager"))
 
-    registryPrx = Ice.LocatorRegistryPrx.uncheckedCast(adapter.add(registry, communicator.stringToIdentity("registry")))
+    registryPrx = Ice.LocatorRegistryPrx.uncheckedCast(adapter.add(registry, Ice.stringToIdentity("registry")))
 
     locator = ServerLocator(registry, registryPrx)
-    adapter.add(locator, communicator.stringToIdentity("locator"))
+    adapter.add(locator, Ice.stringToIdentity("locator"))
 
     adapter.activate()
     communicator.waitForShutdown()
diff --git a/python/test/Ice/objects/Collocated.py b/python/test/Ice/objects/Collocated.py
index e3c50516101..02570bc35a9 100755
--- a/python/test/Ice/objects/Collocated.py
+++ b/python/test/Ice/objects/Collocated.py
@@ -19,9 +19,9 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     initial = TestI.InitialI(adapter)
-    adapter.add(initial, communicator.stringToIdentity("initial"))
+    adapter.add(initial, Ice.stringToIdentity("initial"))
     uoet = TestI.UnexpectedObjectExceptionTestI()
-    adapter.add(uoet, communicator.stringToIdentity("uoet"))
+    adapter.add(uoet, Ice.stringToIdentity("uoet"))
     #adapter.activate() // Don't activate OA to ensure collocation is used.
 
     AllTests.allTests(communicator)
diff --git a/python/test/Ice/objects/Server.py b/python/test/Ice/objects/Server.py
index 0758fc4009b..89b440c6845 100755
--- a/python/test/Ice/objects/Server.py
+++ b/python/test/Ice/objects/Server.py
@@ -32,9 +32,9 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     initial = TestI.InitialI(adapter)
-    adapter.add(initial, communicator.stringToIdentity("initial"))
+    adapter.add(initial, Ice.stringToIdentity("initial"))
     uoet = TestI.UnexpectedObjectExceptionTestI()
-    adapter.add(uoet, communicator.stringToIdentity("uoet"))
+    adapter.add(uoet, Ice.stringToIdentity("uoet"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/operations/Collocated.py b/python/test/Ice/operations/Collocated.py
index d57476734de..757d5089247 100755
--- a/python/test/Ice/operations/Collocated.py
+++ b/python/test/Ice/operations/Collocated.py
@@ -22,7 +22,7 @@ import Test, TestI, AllTests
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    prx = adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test"))
+    prx = adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
     #adapter.activate() // Don't activate OA to ensure collocation is used.
 
     if prx.ice_getConnection():
diff --git a/python/test/Ice/operations/Server.py b/python/test/Ice/operations/Server.py
index 1ecf2c4a213..3c740d9504e 100755
--- a/python/test/Ice/operations/Server.py
+++ b/python/test/Ice/operations/Server.py
@@ -21,7 +21,7 @@ import Test, TestI
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test"))
+    adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py
index 63611ff1ed8..20f1dc2de45 100755
--- a/python/test/Ice/operations/ServerAMD.py
+++ b/python/test/Ice/operations/ServerAMD.py
@@ -96,7 +96,7 @@ class MyDerivedClassI(Test.MyDerivedClass):
 
     def opMyClass_async(self, cb, p1, current=None):
         p2 = p1
-        p3 = Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(communicator.stringToIdentity("noSuchIdentity")))
+        p3 = Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(Ice.stringToIdentity("noSuchIdentity")))
         cb.ice_response(Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3)
 
     def opStruct_async(self, cb, p1, p2, current=None):
@@ -416,7 +416,7 @@ class MyDerivedClassI(Test.MyDerivedClass):
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(MyDerivedClassI(), communicator.stringToIdentity("test"))
+    adapter.add(MyDerivedClassI(), Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/operations/TestI.py b/python/test/Ice/operations/TestI.py
index 449afb523fe..b776b075e78 100644
--- a/python/test/Ice/operations/TestI.py
+++ b/python/test/Ice/operations/TestI.py
@@ -60,7 +60,7 @@ class MyDerivedClassI(Test.MyDerivedClass):
 
     def opMyClass(self, p1, current=None):
         return (Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.id)), p1,
-                Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))))
+                Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(Ice.stringToIdentity("noSuchIdentity"))))
 
     def opStruct(self, p1, p2, current=None):
         p1.s.s = "a new string"
@@ -328,47 +328,45 @@ class MyDerivedClassI(Test.MyDerivedClass):
 
     def opShort1(self, value, current=None):
         return value
-    
+
     def opInt1(self, value, current=None):
         return value
-    
+
     def opLong1(self, value, current=None):
         return value
-    
+
     def opFloat1(self, value, current=None):
         return value
-    
+
     def opDouble1(self, value, current=None):
         return value
-    
+
     def opString1(self, value, current=None):
         return value
-    
+
     def opStringS1(self, value, current=None):
         return value
-    
+
     def opByteBoolD1(self, value, current=None):
         return value
-    
+
     def opStringS2(self, value, current=None):
         return value
-    
+
     def opByteBoolD2(self, value, current=None):
         return value
-    
+
     def opMyClass1(self, value, current=None):
         return value
 
     def opMyStruct1(self, value, current=None):
         return value
-    
+
     def opStringLiterals(self, current=None):
         return [Test.s0, Test.s1, Test.s2, Test.s3, Test.s4, Test.s5, Test.s6, Test.s7, Test.s8, Test.s9, Test.s10,
                 Test.sw0, Test.sw1, Test.sw2, Test.sw3, Test.sw4, Test.sw5, Test.sw6, Test.sw7, Test.sw8, Test.sw9, Test.sw10,
                 Test.ss0, Test.ss1, Test.ss2, Test.ss3, Test.ss4, Test.ss5,
                 Test.su0, Test.su1, Test.su2]
-    
+
     def opWStringLiterals(self, current=None):
         return self.opStringLiterals(current)
-
-    
\ No newline at end of file
diff --git a/python/test/Ice/operations/Twoways.py b/python/test/Ice/operations/Twoways.py
index 8944ed4d94a..a1b2d2848b5 100644
--- a/python/test/Ice/operations/Twoways.py
+++ b/python/test/Ice/operations/Twoways.py
@@ -266,9 +266,9 @@ def twoways(communicator, p):
     test(Ice.proxyIdentityAndFacetEqual(c1, p))
     test(not Ice.proxyIdentityAndFacetEqual(c2, p))
     test(Ice.proxyIdentityAndFacetEqual(r, p))
-    test(c1.ice_getIdentity() == communicator.stringToIdentity("test"))
-    test(c2.ice_getIdentity() == communicator.stringToIdentity("noSuchIdentity"))
-    test(r.ice_getIdentity() == communicator.stringToIdentity("test"))
+    test(c1.ice_getIdentity() == Ice.stringToIdentity("test"))
+    test(c2.ice_getIdentity() == Ice.stringToIdentity("noSuchIdentity"))
+    test(r.ice_getIdentity() == Ice.stringToIdentity("test"))
     r.opVoid()
     c1.opVoid()
     try:
diff --git a/python/test/Ice/operations/TwowaysAMI.py b/python/test/Ice/operations/TwowaysAMI.py
index 10002fb4704..cb356b3177f 100644
--- a/python/test/Ice/operations/TwowaysAMI.py
+++ b/python/test/Ice/operations/TwowaysAMI.py
@@ -90,9 +90,9 @@ class Callback(CallbackBase):
         self.called()
 
     def opMyClass(self, r, c1, c2):
-        test(c1.ice_getIdentity() == self._communicator.stringToIdentity("test"))
-        test(c2.ice_getIdentity() == self._communicator.stringToIdentity("noSuchIdentity"))
-        test(r.ice_getIdentity() == self._communicator.stringToIdentity("test"))
+        test(c1.ice_getIdentity() == Ice.stringToIdentity("test"))
+        test(c2.ice_getIdentity() == Ice.stringToIdentity("noSuchIdentity"))
+        test(r.ice_getIdentity() == Ice.stringToIdentity("test"))
         # We can't do the callbacks below in serialize mode
         if self._communicator.getProperties().getPropertyAsInt("Ice.Client.ThreadPool.Serialize") == 0:
             r.opVoid()
diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py
index bf4236de34d..106fe5182eb 100755
--- a/python/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
@@ -163,7 +163,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
     initial = InitialI()
-    adapter.add(initial, communicator.stringToIdentity("initial"))
+    adapter.add(initial, Ice.stringToIdentity("initial"))
     adapter.activate()
 
     communicator.waitForShutdown()
diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py
index a300cf17e22..ab0bfc28abf 100755
--- a/python/test/Ice/optional/ServerAMD.py
+++ b/python/test/Ice/optional/ServerAMD.py
@@ -164,7 +164,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
     initial = InitialI()
-    adapter.add(initial, communicator.stringToIdentity("initial"))
+    adapter.add(initial, Ice.stringToIdentity("initial"))
     adapter.activate()
 
     communicator.waitForShutdown()
diff --git a/python/test/Ice/proxy/Collocated.py b/python/test/Ice/proxy/Collocated.py
index 43565504d3b..26574d5b64e 100755
--- a/python/test/Ice/proxy/Collocated.py
+++ b/python/test/Ice/proxy/Collocated.py
@@ -22,7 +22,7 @@ import Test, TestI, AllTests
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test"))
+    adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
     #adapter.activate() // Don't activate OA to ensure collocation is used.
 
     AllTests.allTests(communicator, True)
diff --git a/python/test/Ice/proxy/Server.py b/python/test/Ice/proxy/Server.py
index 9c91f317da3..33ec4916591 100755
--- a/python/test/Ice/proxy/Server.py
+++ b/python/test/Ice/proxy/Server.py
@@ -23,7 +23,7 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
 
-    adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test"))
+    adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py
index 028dfb55af7..35804df3068 100755
--- a/python/test/Ice/proxy/ServerAMD.py
+++ b/python/test/Ice/proxy/ServerAMD.py
@@ -40,7 +40,7 @@ class MyDerivedClassI(Test.MyDerivedClass):
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(MyDerivedClassI(), communicator.stringToIdentity("test"))
+    adapter.add(MyDerivedClassI(), Ice.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/servantLocator/Collocated.py b/python/test/Ice/servantLocator/Collocated.py
index 872fe98ca78..256d8a73542 100755
--- a/python/test/Ice/servantLocator/Collocated.py
+++ b/python/test/Ice/servantLocator/Collocated.py
@@ -23,8 +23,8 @@ class TestServer(Ice.Application):
         #adapter.activate() // Don't activate OA to ensure collocation is used.
         adapter.addServantLocator(TestI.ServantLocatorI("category"), "category")
         adapter.addServantLocator(TestI.ServantLocatorI(""), "")
-        adapter.add(TestI.TestI(), self.communicator().stringToIdentity("asm"))
-        adapter.add(TestActivationI.TestActivationI(), self.communicator().stringToIdentity("test/activation"))
+        adapter.add(TestI.TestI(), Ice.stringToIdentity("asm"))
+        adapter.add(TestActivationI.TestActivationI(), Ice.stringToIdentity("test/activation"))
 
         AllTests.allTests(self.communicator(), False)
 
diff --git a/python/test/Ice/servantLocator/Server.py b/python/test/Ice/servantLocator/Server.py
index 0d5ed9e3574..3eb06581e9a 100755
--- a/python/test/Ice/servantLocator/Server.py
+++ b/python/test/Ice/servantLocator/Server.py
@@ -22,8 +22,8 @@ class TestServer(Ice.Application):
         adapter = self.communicator().createObjectAdapter("TestAdapter")
         adapter.addServantLocator(TestI.ServantLocatorI("category"), "category")
         adapter.addServantLocator(TestI.ServantLocatorI(""), "")
-        adapter.add(TestI.TestI(), self.communicator().stringToIdentity("asm"))
-        adapter.add(TestActivationI.TestActivationI(), self.communicator().stringToIdentity("test/activation"))
+        adapter.add(TestI.TestI(), Ice.stringToIdentity("asm"))
+        adapter.add(TestActivationI.TestActivationI(), Ice.stringToIdentity("test/activation"))
 
         adapter.activate()
         adapter.waitForDeactivate()
diff --git a/python/test/Ice/servantLocator/ServerAMD.py b/python/test/Ice/servantLocator/ServerAMD.py
index 9714e9525b8..78c87c366a1 100755
--- a/python/test/Ice/servantLocator/ServerAMD.py
+++ b/python/test/Ice/servantLocator/ServerAMD.py
@@ -22,8 +22,8 @@ class TestServer(Ice.Application):
         adapter = self.communicator().createObjectAdapter("TestAdapter")
         adapter.addServantLocator(TestAMDI.ServantLocatorI("category"), "category")
         adapter.addServantLocator(TestAMDI.ServantLocatorI(""), "")
-        adapter.add(TestAMDI.TestI(), self.communicator().stringToIdentity("asm"))
-        adapter.add(TestActivationAMDI.TestActivationAMDI(), self.communicator().stringToIdentity("test/activation"))
+        adapter.add(TestAMDI.TestI(), Ice.stringToIdentity("asm"))
+        adapter.add(TestActivationAMDI.TestActivationAMDI(), Ice.stringToIdentity("test/activation"))
 
         adapter.activate()
         adapter.waitForDeactivate()
diff --git a/python/test/Ice/slicing/exceptions/Server.py b/python/test/Ice/slicing/exceptions/Server.py
index be53319bfa1..da672a90a7d 100755
--- a/python/test/Ice/slicing/exceptions/Server.py
+++ b/python/test/Ice/slicing/exceptions/Server.py
@@ -157,7 +157,7 @@ def run(args, communicator):
     properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI()
-    adapter.add(object, communicator.stringToIdentity("Test"))
+    adapter.add(object, Ice.stringToIdentity("Test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/slicing/exceptions/ServerAMD.py b/python/test/Ice/slicing/exceptions/ServerAMD.py
index e0fee657c5b..9b3004e1d6e 100755
--- a/python/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/python/test/Ice/slicing/exceptions/ServerAMD.py
@@ -175,7 +175,7 @@ def run(args, communicator):
     properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI()
-    adapter.add(object, communicator.stringToIdentity("Test"))
+    adapter.add(object, Ice.stringToIdentity("Test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/slicing/objects/Server.py b/python/test/Ice/slicing/objects/Server.py
index 18e485fb52b..6103da811fe 100755
--- a/python/test/Ice/slicing/objects/Server.py
+++ b/python/test/Ice/slicing/objects/Server.py
@@ -368,7 +368,7 @@ def run(args, communicator):
     properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI()
-    adapter.add(object, communicator.stringToIdentity("Test"))
+    adapter.add(object, Ice.stringToIdentity("Test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/slicing/objects/ServerAMD.py b/python/test/Ice/slicing/objects/ServerAMD.py
index 4d7b9a3b96a..1477e119151 100755
--- a/python/test/Ice/slicing/objects/ServerAMD.py
+++ b/python/test/Ice/slicing/objects/ServerAMD.py
@@ -397,7 +397,7 @@ def run(args, communicator):
     properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI()
-    adapter.add(object, communicator.stringToIdentity("Test"))
+    adapter.add(object, Ice.stringToIdentity("Test"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Ice/timeout/Server.py b/python/test/Ice/timeout/Server.py
index d5e82452cfe..1a1b52014cc 100755
--- a/python/test/Ice/timeout/Server.py
+++ b/python/test/Ice/timeout/Server.py
@@ -51,7 +51,7 @@ class TimeoutI(Test.Timeout):
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TimeoutI(), communicator.stringToIdentity("timeout"))
+    adapter.add(TimeoutI(), Ice.stringToIdentity("timeout"))
     adapter.activate()
     communicator.waitForShutdown()
     return True
diff --git a/python/test/Slice/keyword/Client.py b/python/test/Slice/keyword/Client.py
index b58ded5b824..a81722b544d 100755
--- a/python/test/Slice/keyword/Client.py
+++ b/python/test/Slice/keyword/Client.py
@@ -79,13 +79,13 @@ def testtypes():
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(execI(), communicator.stringToIdentity("test"))
+    adapter.add(execI(), Ice.stringToIdentity("test"))
     adapter.activate()
 
     sys.stdout.write("Testing operation name... ")
     sys.stdout.flush()
     p = _and.execPrx.uncheckedCast(
-        adapter.createProxy(communicator.stringToIdentity("test")));
+        adapter.createProxy(Ice.stringToIdentity("test")));
     p._finally();
     print("ok")