From c7c1f699ba483654610f4a4daa08a6df8c81e0d4 Mon Sep 17 00:00:00 2001 From: Guido van Rossum <guido@python.org> Date: Thu, 26 Sep 2002 16:13:45 +0000 Subject: [PATCH] Fix the Windows version of the ro_svr code. --- src/ZEO/tests/forker.py | 6 +++--- src/ZEO/tests/winserver.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ZEO/tests/forker.py b/src/ZEO/tests/forker.py index 975b1ea1..d1884c1a 100644 --- a/src/ZEO/tests/forker.py +++ b/src/ZEO/tests/forker.py @@ -64,10 +64,10 @@ if os.name == "nt": if script.endswith('.pyc'): script = script[:-1] if ro_svr: - args = (sys.executable, script, "-r") + prefix = (sys.executable, script, "-r") else: - args = (sys.executable, script) - args += (str(port), storage_name) + args + prefix = (sys.executable, script) + args = prefix + (str(port), storage_name) + args d = os.environ.copy() d['PYTHONPATH'] = os.pathsep.join(sys.path) pid = os.spawnve(os.P_NOWAIT, sys.executable, args, d) diff --git a/src/ZEO/tests/winserver.py b/src/ZEO/tests/winserver.py index d5f1935e..9501daeb 100644 --- a/src/ZEO/tests/winserver.py +++ b/src/ZEO/tests/winserver.py @@ -55,7 +55,7 @@ def main(args): if args[0] == "-r": ro_svr = 1 del args[0] - port, storage_name, rawargs = args + port, storage_name, rawargs = args[0], args[1], args[2:] klass = load_storage_class(storage_name) args = [] for arg in rawargs: @@ -66,7 +66,7 @@ def main(args): zeo_port = int(port) test_port = zeo_port + 1 t = ZEOTestServer(('', test_port), storage) - addr = [('', zeo_port)] + addr = ('', zeo_port) serv = ZEO.StorageServer.StorageServer(addr, {'1': storage}, ro_svr) import zLOG label = "winserver:%d" % os.getpid() -- 2.30.9