1 files changed, 5 insertions, 7 deletions
diff --git a/cpp/demo/book/simple_filesystem/expect.py b/cpp/demo/book/simple_filesystem/expect.py
index 07f8c64905d..a2a9e91955d 100755
--- a/cpp/demo/book/simple_filesystem/expect.py
+++ b/cpp/demo/book/simple_filesystem/expect.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import sys, os
+import sys, os, signal
 
 path = [ ".", "..", "../..", "../../..", "../../../.." ]
 head = os.path.dirname(sys.argv[0])
@@ -16,21 +16,19 @@ if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
 path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "demoscript")) ]
 if len(path) == 0:
-    raise "can't find toplevel directory!"
+    raise RuntimeError("can't find toplevel directory!")
 sys.path.append(path[0])
 
-from demoscript import *
-
-import signal
+from demoscript import Util
 
 server = Util.spawn('./server --Ice.PrintAdapterReady')
 server.expect('.* ready')
 
-print "testing...",
+sys.stdout.write("testing... ")
 sys.stdout.flush()
 client = Util.spawn('./client')
 client.expect('Contents of root directory:\n.*Down to a sunless sea.')
 client.waitTestSuccess()
 server.kill(signal.SIGINT)
 server.waitTestSuccess()
-print "ok"
+print("ok")