summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2008-04-22 14:21:13 -0700
committerMark Spruiell <mes@zeroc.com>2008-04-22 14:21:13 -0700
commitc4fc985a6c9f68b65c77a572f97da120ac8ebe1c (patch)
treead78a69fb54c8b0eb281272332f895d5cc387698 /py
parentIceGrid Win32 build fix (diff)
downloadice-c4fc985a6c9f68b65c77a572f97da120ac8ebe1c.tar.bz2
ice-c4fc985a6c9f68b65c77a572f97da120ac8ebe1c.tar.xz
ice-c4fc985a6c9f68b65c77a572f97da120ac8ebe1c.zip
bug 3012 - Python converter demo fixes
Diffstat (limited to 'py')
-rwxr-xr-xpy/demo/Ice/converter/Client.py13
-rwxr-xr-xpy/demo/Ice/converter/Server.py11
2 files changed, 16 insertions, 8 deletions
diff --git a/py/demo/Ice/converter/Client.py b/py/demo/Ice/converter/Client.py
index 0cfa49cb3db..c05f8f31ec8 100755
--- a/py/demo/Ice/converter/Client.py
+++ b/py/demo/Ice/converter/Client.py
@@ -24,8 +24,14 @@ x: exit
"""
def decodeString(str):
- # TODO: implement properly!
- return str
+ ret = ""
+ for i in range(0, len(str)):
+ n = ord(str[i])
+ if n < 32 or n > 126:
+ ret += "\\" + oct(n)[1:] # Skip leading '0'
+ else:
+ ret += str[i]
+ return ret
communicator1 = None
communicator2 = None
@@ -78,8 +84,6 @@ class Client:
return 0
-
-
status = 0
try:
@@ -105,7 +109,6 @@ except:
traceback.print_exc()
status = 1
-
if communicator1:
try:
communicator1.destroy()
diff --git a/py/demo/Ice/converter/Server.py b/py/demo/Ice/converter/Server.py
index 792ce32551a..88f6d9fb9a2 100755
--- a/py/demo/Ice/converter/Server.py
+++ b/py/demo/Ice/converter/Server.py
@@ -14,8 +14,14 @@ Ice.loadSlice('Greet.ice')
import Demo
def decodeString(str):
- # TODO: implement properly!
- return str
+ ret = ""
+ for i in range(0, len(str)):
+ n = ord(str[i])
+ if n < 32 or n > 126:
+ ret += "\\" + oct(n)[1:] # Skip leading '0'
+ else:
+ ret += str[i]
+ return ret
class GreatI(Demo.Greet):
def exchangeGreeting(self, msg, current=None):
@@ -25,7 +31,6 @@ class GreatI(Demo.Greet):
def shutdown(self, current=None):
current.adapter.getCommunicator().shutdown()
-
class Server(Ice.Application):
def run(self, args):