Commit 8466bdc9 authored by Jim Fulton's avatar Jim Fulton

Removed trailing whitespace.

parent c7cacdb7
...@@ -44,7 +44,7 @@ def server(path=None, blob_dir=None, storage_conf=None, zeo_conf=None, ...@@ -44,7 +44,7 @@ def server(path=None, blob_dir=None, storage_conf=None, zeo_conf=None,
path path
A file-storage path. This argument is ignored if a storage A file-storage path. This argument is ignored if a storage
configuration is supplied. configuration is supplied.
blob_dir blob_dir
A blob directory path. This argument is ignored if a storage A blob directory path. This argument is ignored if a storage
configuration is supplied. configuration is supplied.
...@@ -57,12 +57,12 @@ def server(path=None, blob_dir=None, storage_conf=None, zeo_conf=None, ...@@ -57,12 +57,12 @@ def server(path=None, blob_dir=None, storage_conf=None, zeo_conf=None,
zeo_conf zeo_conf
A ZEO server configuration string. A ZEO server configuration string.
port port
If no ZEO configuration is supplied, the one will be computed If no ZEO configuration is supplied, the one will be computed
from the port. If no port is supplied, one will be chosedn from the port. If no port is supplied, one will be chosedn
randomly. randomly.
""" """
import os, ZEO.tests.forker import os, ZEO.tests.forker
if storage_conf is None and path is None: if storage_conf is None and path is None:
...@@ -77,4 +77,4 @@ def server(path=None, blob_dir=None, storage_conf=None, zeo_conf=None, ...@@ -77,4 +77,4 @@ def server(path=None, blob_dir=None, storage_conf=None, zeo_conf=None,
def stop_server(): def stop_server():
ZEO.tests.forker.shutdown_zeo_server(admin) ZEO.tests.forker.shutdown_zeo_server(admin)
os.waitpid(pid, 0) os.waitpid(pid, 0)
return addr, stop_server return addr, stop_server
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment