1 files changed, 10 insertions, 15 deletions
diff --git a/cpp/demo/IceUtil/workqueue/expect.py b/cpp/demo/IceUtil/workqueue/expect.py
index b66616041cc..d984916b693 100755
--- a/cpp/demo/IceUtil/workqueue/expect.py
+++ b/cpp/demo/IceUtil/workqueue/expect.py
@@ -10,23 +10,18 @@
 
 import sys, os
 
-try:
-    import demoscript
-except ImportError:
-    for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-        toplevel = os.path.normpath(toplevel)
-        if os.path.exists(os.path.join(toplevel, "demoscript")):
-            break
-    else:
-        raise "can't find toplevel directory!"
-    sys.path.append(os.path.join(toplevel))
-    import demoscript
+path = [ ".", "..", "../..", "../../..", "../../../.." ]
+head = os.path.dirname(sys.argv[0])
+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!"
+sys.path.append(path[0])
 
-import demoscript.Util
-demoscript.Util.defaultLanguage = "C++"
-import demoscript.Ice.hello
+from demoscript import *
 
-server = demoscript.Util.spawn('./workqueue')
+server = Util.spawn('./workqueue')
 server.expect('Pushing work items')
 
 print "testing...",