python 3 support

4 files changed, 64 insertions, 67 deletions

diff --git a/demoscript/IceGrid/allocate.py b/demoscript/IceGrid/allocate.py
index e1a768b8cc4..ed81add183f 100755
--- a/demoscript/IceGrid/allocate.py
+++ b/demoscript/IceGrid/allocate.py
@@ -9,11 +9,11 @@
 # **********************************************************************
 
 import sys, os
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
+import Expect
 
 def run(clientCmd):
-    print "cleaning databases...",
+    sys.stdout.write("cleaning databases... ")
     sys.stdout.flush()
     nodeDir = os.path.join("db", "node")
     if not os.path.exists(nodeDir):
@@ -25,28 +25,28 @@ def run(clientCmd):
         os.mkdir(regDir)
     else:
         Util.cleanDbDir(regDir)
-    print "ok"
+    print("ok")
 
     if Util.defaultHost:
         args = ' --IceGrid.Node.PropertiesOverride="Ice.Default.Host=127.0.0.1"'
     else:
         args = ''
 
-    print "starting icegridnode...",
+    sys.stdout.write("starting icegridnode... ")
     sys.stdout.flush()
     node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.grid --Ice.PrintAdapterReady %s' % (args))
     node.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready\nIceGrid.Node ready')
-    print "ok"
+    print("ok")
 
-    print "deploying application...",
+    sys.stdout.write("deploying application... ")
     sys.stdout.flush()
     admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Config=config.grid')
     admin.expect('>>>')
     admin.sendline("application add \'application-single.xml\'")
     admin.expect('>>>')
-    print "ok"
+    print("ok")
 
-    print "testing client...", 
+    sys.stdout.write("testing client... ")
     sys.stdout.flush()
     client1 = Util.spawn(clientCmd)
     client1.expect('user id:')
@@ -77,15 +77,15 @@ def run(clientCmd):
     node.expect('detected termination of server')
     client2.sendline('x')
     client2.waitTestSuccess(timeout=1)
-    print "ok"
+    print("ok")
 
-    print "deploying multiple...", 
+    sys.stdout.write("deploying multiple... ")
     sys.stdout.flush()
     admin.sendline("application update \'application-multiple.xml\'")
     admin.expect('>>>')
-    print "ok"
+    print("ok")
 
-    print "testing client...", 
+    sys.stdout.write("testing client... ")
     sys.stdout.flush()
     client1 = Util.spawn(clientCmd)
     client1.expect('user id:')
@@ -135,7 +135,7 @@ def run(clientCmd):
     client3.sendline('x')
     client3.waitTestSuccess(timeout=1)
 
-    print "ok"
+    print("ok")
 
     admin.sendline('registry shutdown Master')
     admin.sendline('exit')
diff --git a/demoscript/IceGrid/icebox.py b/demoscript/IceGrid/icebox.py
index e3cccfa572a..40de5974e36 100755
--- a/demoscript/IceGrid/icebox.py
+++ b/demoscript/IceGrid/icebox.py
@@ -9,11 +9,10 @@
 # **********************************************************************
 
 import sys, time, os
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
 
 def run(clientStr, desc = 'application'):
-    print "cleaning databases...",
+    sys.stdout.write("cleaning databases... ")
     sys.stdout.flush()
     nodeDir = os.path.join("db", "node")
     if not os.path.exists(nodeDir):
@@ -25,14 +24,14 @@ def run(clientStr, desc = 'application'):
         os.mkdir(regDir)
     else:
         Util.cleanDbDir(regDir)
-    print "ok"
+    print("ok")
 
     if Util.defaultHost:
         args = ' --IceGrid.Node.PropertiesOverride="Ice.Default.Host=127.0.0.1"'
     else:
         args = ''
 
-    print "starting icegridnode...",
+    sys.stdout.write("starting icegridnode... ")
     sys.stdout.flush()
     node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.grid --Ice.PrintAdapterReady %s' % (args))
     node.expect('IceGrid.Registry.Internal ready')
@@ -41,9 +40,9 @@ def run(clientStr, desc = 'application'):
     if Util.getMapping() == "cpp":
         node.expect('IceGrid.Registry.AdminSessionManager ready')
     node.expect('IceGrid.Node ready')
-    print "ok"
+    print("ok")
 
-    print "deploying application...",
+    sys.stdout.write("deploying application... ")
     sys.stdout.flush()
     admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Config=config.grid')
     admin.expect('>>>')
@@ -51,19 +50,19 @@ def run(clientStr, desc = 'application'):
     admin.expect('>>>')
     admin.sendline("server start IceBox")
     admin.expect('>>>', timeout=15)
-    print "ok"
+    print("ok")
 
-    print "testing client...", 
+    sys.stdout.write("testing client... ")
     sys.stdout.flush()
 
     for s in [ "Homer", "Marge", "Bart", "Lisa", "Maggie" ]:
-	client = Util.spawn(clientStr)
-	node.expect("Hello from %s" % s)
-	client.waitTestSuccess(timeout=1)
+        client = Util.spawn(clientStr)
+        node.expect("Hello from %s" % s)
+        client.waitTestSuccess(timeout=1)
 
-    print "ok"
+    print("ok")
 
-    print "testing stop/start of services...", 
+    sys.stdout.write("testing stop/start of services... ")
     sys.stdout.flush()
 
     admin.sendline("service stop IceBox Lisa")
@@ -78,7 +77,7 @@ def run(clientStr, desc = 'application'):
     client = Util.spawn(clientStr)
     node.expect("Hello from Marge")
     client.waitTestSuccess(timeout=1)
-    
+
     client = Util.spawn(clientStr)
     node.expect("Hello from Bart")
     client.waitTestSuccess(timeout=1)
@@ -104,7 +103,7 @@ def run(clientStr, desc = 'application'):
     client = Util.spawn(clientStr)
     node.expect("Hello from Lisa")
     client.waitTestSuccess(timeout=1)
-    
+
     client = Util.spawn(clientStr)
     node.expect("Hello from Maggie")
     client.waitTestSuccess(timeout=1)
@@ -113,9 +112,9 @@ def run(clientStr, desc = 'application'):
     node.expect("Hello from Bart")
     client.waitTestSuccess(timeout=1)
 
-    print "ok"
+    print("ok")
 
-    print "testing administration with Glacier2...", 
+    sys.stdout.write("testing administration with Glacier2... ")
     sys.stdout.flush()
 
     admin.sendline("server start DemoGlacier2")
@@ -124,13 +123,13 @@ def run(clientStr, desc = 'application'):
 
     # Windows seems to have problems with the password input.
     if Util.isWin32():
-	admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Default.Router="DemoGlacier2/router:tcp -h localhost -p 4063" -u foo -p foo')
+        admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Default.Router="DemoGlacier2/router:tcp -h localhost -p 4063" -u foo -p foo')
     else:
-	admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Default.Router="DemoGlacier2/router:tcp -h localhost -p 4063"')
-	admin.expect('user id:')
-	admin.sendline('foo')
-	admin.expect('password:')
-	admin.sendline('foo')
+        admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Default.Router="DemoGlacier2/router:tcp -h localhost -p 4063"')
+        admin.expect('user id:')
+        admin.sendline('foo')
+        admin.expect('password:')
+        admin.sendline('foo')
     admin.expect('>>>', timeout=100)
 
     admin.sendline("service start IceBox Homer")
@@ -158,7 +157,7 @@ def run(clientStr, desc = 'application'):
     node.expect("Hello from Bart")
     client.waitTestSuccess(timeout=1)
 
-    print "ok"
+    print("ok")
 
     admin.sendline('registry shutdown Master')
     admin.sendline('exit')
diff --git a/demoscript/IceGrid/sessionActivation.py b/demoscript/IceGrid/sessionActivation.py
index 81cf884e33c..d27264939aa 100755
--- a/demoscript/IceGrid/sessionActivation.py
+++ b/demoscript/IceGrid/sessionActivation.py
@@ -9,11 +9,10 @@
 # **********************************************************************
 
 import sys,  os
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
 
 def run(clientCmd):
-    print "cleaning databases...",
+    sys.stdout.write("cleaning databases... ")
     sys.stdout.flush()
     nodeDir = os.path.join("db", "node")
     if not os.path.exists(nodeDir):
@@ -25,28 +24,28 @@ def run(clientCmd):
         os.mkdir(regDir)
     else:
         Util.cleanDbDir(regDir)
-    print "ok"
+    print("ok")
 
     if Util.defaultHost:
         args = ' --IceGrid.Node.PropertiesOverride="Ice.Default.Host=127.0.0.1"'
     else:
         args = ''
 
-    print "starting icegridnode...",
+    sys.stdout.write("starting icegridnode... ")
     sys.stdout.flush()
     node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.grid --Ice.PrintAdapterReady %s' % (args))
     node.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready\nIceGrid.Node ready')
-    print "ok"
+    print("ok")
 
-    print "deploying application...",
+    sys.stdout.write("deploying application... ")
     sys.stdout.flush()
     admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Config=config.grid')
     admin.expect('>>>')
     admin.sendline("application add \'application.xml\'")
     admin.expect('>>>')
-    print "ok"
+    print("ok")
 
-    print "testing client...", 
+    sys.stdout.write("testing client... ")
     sys.stdout.flush()
 
     client = Util.spawn(clientCmd)
@@ -75,7 +74,7 @@ def run(clientCmd):
     client.waitTestSuccess(timeout=1)
     node.expect('detected termination of server')
 
-    print "ok"
+    print("ok")
 
     admin.sendline('registry shutdown Master')
     admin.sendline('exit')
diff --git a/demoscript/IceGrid/simple.py b/demoscript/IceGrid/simple.py
index 054492c6baa..dd77a818846 100755
--- a/demoscript/IceGrid/simple.py
+++ b/demoscript/IceGrid/simple.py
@@ -9,11 +9,10 @@
 # **********************************************************************
 
 import sys, time, os
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
 
 def run(clientStr, desc = 'application'):
-    print "cleaning databases...",
+    sys.stdout.write("cleaning databases... ")
     sys.stdout.flush()
     nodeDir = os.path.join("db", "node")
     if not os.path.exists(nodeDir):
@@ -25,31 +24,31 @@ def run(clientStr, desc = 'application'):
         os.mkdir(regDir)
     else:
         Util.cleanDbDir(regDir)
-    print "ok"
+    print("ok")
 
     if Util.defaultHost:
         args = ' --IceGrid.Node.PropertiesOverride="Ice.Default.Host=127.0.0.1"'
     else:
         args = ''
 
-    print "starting icegridnode...",
+    sys.stdout.write("starting icegridnode... ")
     sys.stdout.flush()
     node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.grid --Ice.PrintAdapterReady %s' % (args))
     node.expect('IceGrid.Registry.Internal ready')
     node.expect('IceGrid.Registry.Server ready')
     node.expect('IceGrid.Registry.Client ready')
     node.expect('IceGrid.Node ready')
-    print "ok"
+    print("ok")
 
-    print "deploying application...",
+    sys.stdout.write("deploying application... ")
     sys.stdout.flush()
     admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Config=config.grid')
     admin.expect('>>>')
     admin.sendline("application add \'%s.xml\'" %(desc))
     admin.expect('>>>')
-    print "ok"
+    print("ok")
 
-    print "testing client...", 
+    sys.stdout.write("testing client... ")
     sys.stdout.flush()
     client = Util.spawn(clientStr)
     client.expect('==>')
@@ -62,15 +61,15 @@ def run(clientStr, desc = 'application'):
     client.sendline('x')
 
     client.waitTestSuccess(timeout=1)
-    print "ok"
+    print("ok")
 
-    print "deploying template...", 
+    sys.stdout.write("deploying template... ")
     sys.stdout.flush()
     admin.sendline("application update \'%s_with_template.xml\'" % (desc))
     admin.expect('>>>')
-    print "ok"
+    print("ok")
 
-    print "testing client...", 
+    sys.stdout.write("testing client... ")
     sys.stdout.flush()
     client = Util.spawn(clientStr)
     client.expect('==>')
@@ -83,15 +82,15 @@ def run(clientStr, desc = 'application'):
     client.sendline('x')
 
     client.waitTestSuccess(timeout=1)
-    print "ok"
+    print("ok")
 
-    print "deploying replicated version...", 
+    sys.stdout.write("deploying replicated version... ")
     sys.stdout.flush()
     admin.sendline("application update \'%s_with_replication.xml\'" %(desc))
     admin.expect('>>> ')
-    print "ok"
+    print("ok")
 
-    print "testing client...", 
+    sys.stdout.write("testing client... ")
     sys.stdout.flush()
 
     def testserver(which):
@@ -111,7 +110,7 @@ def run(clientStr, desc = 'application'):
     testserver(2)
     testserver(3)
 
-    print "ok"
+    print("ok")
 
     admin.sendline('registry shutdown Master')
     admin.sendline('exit')