Fixed ICE-5546: Python Ice/converter demo

4 files changed, 17 insertions, 18 deletions

diff --git a/py/demo/Ice/converter/Client.py b/py/demo/Ice/converter/Client.py
index f6fecb9ef15..a6a8977eebc 100755
--- a/py/demo/Ice/converter/Client.py
+++ b/py/demo/Ice/converter/Client.py
@@ -63,13 +63,13 @@ class Client:
                 sys.stdout.flush()
                 c = sys.stdin.readline().strip()
                 if c == 't':
-                    ret = greet1.exchangeGreeting(greeting)
-                    print("Received: \"" + decodeString(ret) + "\"")
-                elif c == 'u':
                     ret = greet2.exchangeGreeting(greeting)
-                    print("Received: \"" + decodeString(ret) + "\"")
+                    print("Received by client: \"" + decodeString(ret) + "\"")
+                elif c == 'u':
+                    ret = greet1.exchangeGreeting(greeting)
+                    print("Received by client: \"" + decodeString(ret) + "\"")
                 elif c == 's':
-                    greet1.shutdown()
+                    greet2.shutdown()
                 elif c == 'x':
                     pass # Nothing to do
                 elif c == '?':
@@ -94,14 +94,14 @@ try:
     initData.properties = Ice.createProperties(None, initData.properties)
     initData.properties.load("config.client")
     #
-    # With converter
+    # Without converter
     #
     communicator1 = Ice.initialize(sys.argv, initData)
 
     #
-    # Clear plug-in, so no converter
+    # Add converter plugin (can't be removed later on)
     #
-    initData.properties.setProperty("Ice.Plugin.StringConverter", "")
+    initData.properties.setProperty("Ice.Plugin.StringConverter", "Ice:createStringConverter iconv=ISO8859-1 windows=1252")
     communicator2 = Ice.initialize(sys.argv, initData)
 
     app = Client()
diff --git a/py/demo/Ice/converter/Server.py b/py/demo/Ice/converter/Server.py
index 8ea6fd82446..b8914c651ad 100755
--- a/py/demo/Ice/converter/Server.py
+++ b/py/demo/Ice/converter/Server.py
@@ -26,7 +26,7 @@ def decodeString(str):
 class GreatI(Demo.Greet):
     def exchangeGreeting(self, msg, current=None):
        
-        print("Received (UTF-8): \"" + decodeString(msg) + "\"")
+        print("Received by server (UTF-8): \"" + decodeString(msg) + "\"")
         return "Bonne journ\303\251e"
 
     def shutdown(self, current=None):
diff --git a/py/demo/Ice/converter/config.client b/py/demo/Ice/converter/config.client
index 9fdbe018e56..301944db202 100644
--- a/py/demo/Ice/converter/config.client
+++ b/py/demo/Ice/converter/config.client
@@ -4,7 +4,6 @@
 #
 Greet.Proxy=greet:tcp -h localhost -p 10000
 
-Ice.Plugin.StringConverter=Ice:createStringConverter iconv=ISO8859-1 windows=1252
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/converter/expect.py b/py/demo/Ice/converter/expect.py
index a3b3f5c4099..afa8f86ef2a 100755
--- a/py/demo/Ice/converter/expect.py
+++ b/py/demo/Ice/converter/expect.py
@@ -30,22 +30,22 @@ sys.stdout.write("testing with conversion... ")
 sys.stdout.flush()
 client.sendline('u')
 if sys.version_info[0] == 2:
-    server.expect('Received \\(UTF-8\\): "Bonne journ\\\\351e"')
-    client.expect('Received: "Bonne journ\\\\303\\\\251e"')
+    server.expect('Received by server \\(UTF-8\\): "Bonne journ\\\\351e"')
+    client.expect('Received by client: "Bonne journ\\\\303\\\\251e"')
 else:
-    server.expect('Received \\(UTF-8\\): "Bonne journ\\\\o351e"')
-    client.expect('Received: "Bonne journ\\\\o303\\\\o251e"')
+    server.expect('Received by server \\(UTF-8\\): "Bonne journ\\\\o351e"')
+    client.expect('Received by client: "Bonne journ\\\\o303\\\\o251e"')
 print("ok")
 
 sys.stdout.write("testing without conversion... ")
 sys.stdout.flush()
 client.sendline('t')
 if sys.version_info[0] == 2:
-    server.expect('Received \\(UTF-8\\): "Bonne journ\\\\303\\\\251e"')
-    client.expect('Received: "Bonne journ\\\\351e"')
+    server.expect('Received by server \\(UTF-8\\): "Bonne journ\\\\303\\\\251e"')
+    client.expect('Received by client: "Bonne journ\\\\351e"')
 else:
-    server.expect('Received \\(UTF-8\\): "Bonne journ\\\\o303\\\\o251e"')
-    client.expect('Received: "Bonne journ\\\\o351e"')
+    server.expect('Received by server \\(UTF-8\\): "Bonne journ\\\\o303\\\\o251e"')
+    client.expect('Received by client: "Bonne journ\\\\o351e"')
 print("ok")
 
 client.sendline('s')