summaryrefslogtreecommitdiff
path: root/demoscript/IceStorm/clock.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2012-04-24 14:16:15 -0700
committerMark Spruiell <mes@zeroc.com>2012-04-24 14:16:15 -0700
commit943a48fc5c0a59b892eb746073c71b8dd88815e7 (patch)
tree421cfedbc60603d02e0b314d9204e9f85dd781c5 /demoscript/IceStorm/clock.py
parentminor fix to IcePHP getLogger (diff)
downloadice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.bz2
ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.xz
ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.zip
python 3 support
Diffstat (limited to 'demoscript/IceStorm/clock.py')
-rwxr-xr-xdemoscript/IceStorm/clock.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/demoscript/IceStorm/clock.py b/demoscript/IceStorm/clock.py
index 8ad9e241729..a5e75db91e0 100755
--- a/demoscript/IceStorm/clock.py
+++ b/demoscript/IceStorm/clock.py
@@ -9,11 +9,10 @@
# **********************************************************************
import sys, time, signal
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
def runtest(icestorm, subCmd, subargs, pubCmd, pubargs):
- print "testing pub%s/sub%s..." % (pubargs, subargs),
+ sys.stdout.write("testing pub%s/sub%s... " % (pubargs, subargs))
sys.stdout.flush()
sub = Util.spawn('%s --Ice.PrintAdapterReady %s' %(subCmd, subargs))
sub.expect('.* ready')
@@ -34,13 +33,13 @@ def runtest(icestorm, subCmd, subargs, pubCmd, pubargs):
if sub.hasInterruptSupport():
icestorm.expect('unsubscribe:')
- print "ok"
+ print("ok")
def run(subCmd, pubCmd):
- print "cleaning databases...",
+ sys.stdout.write("cleaning databases... ")
sys.stdout.flush()
Util.cleanDbDir("db")
- print "ok"
+ print("ok")
if Util.defaultHost:
args = ' --IceBox.Service.IceStorm="IceStormService,34:createIceStorm --Ice.Config=config.service %s"' % Util.defaultHost