Deprecate Communicator::stringToIdentity and identityToString

6 files changed, 23 insertions, 25 deletions

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()