summaryrefslogtreecommitdiff
path: root/demoscript/Ice/hello.py
diff options
context:
space:
mode:
Diffstat (limited to 'demoscript/Ice/hello.py')
-rw-r--r--demoscript/Ice/hello.py23
1 files changed, 11 insertions, 12 deletions
diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py
index baa2210fc5d..990e9426f30 100644
--- a/demoscript/Ice/hello.py
+++ b/demoscript/Ice/hello.py
@@ -9,26 +9,25 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
+import Expect
def runtests(client, server, secure):
- print "testing twoway",
+ sys.stdout.write("testing twoway ")
sys.stdout.flush()
client.sendline('t')
server.expect('Hello World!')
- print "oneway",
+ sys.stdout.write("oneway ")
sys.stdout.flush()
client.sendline('o')
server.expect('Hello World!')
if not secure:
- print "datagram",
+ sys.stdout.write("datagram ")
sys.stdout.flush()
client.sendline('d')
server.expect('Hello World!')
- print "... ok"
+ print("... ok")
- print "testing batch oneway",
+ sys.stdout.write("testing batch oneway ")
sys.stdout.flush()
client.sendline('O')
try:
@@ -40,7 +39,7 @@ def runtests(client, server, secure):
server.expect('Hello World!')
server.expect('Hello World!')
if not secure:
- print "datagram",
+ sys.stdout.write("datagram ")
sys.stdout.flush()
client.sendline('D')
try:
@@ -51,9 +50,9 @@ def runtests(client, server, secure):
client.sendline('f')
server.expect('Hello World!')
server.expect('Hello World!')
- print "... ok"
+ print("... ok")
- print "testing timeout...",
+ sys.stdout.write("testing timeout... ")
sys.stdout.flush()
client.sendline('T')
client.sendline('P')
@@ -67,12 +66,12 @@ def runtests(client, server, secure):
client.sendline('t')
server.expect('Hello World!')
client.sendline('T')
- print "ok"
+ print("ok")
def run(client, server):
runtests(client, server, False)
- print "repeating tests with SSL"
+ print("repeating tests with SSL")
client.sendline('S')