python 3 support

1 files changed, 9 insertions, 10 deletions

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