Commit a8ccb274 authored by Albertas Agejevas's avatar Albertas Agejevas

More Py3 fixes.

parent b05992e1
...@@ -1232,7 +1232,7 @@ def client_asyncore_thread_has_name(): ...@@ -1232,7 +1232,7 @@ def client_asyncore_thread_has_name():
def runzeo_without_configfile(): def runzeo_without_configfile():
""" """
>>> open('runzeo', 'w').write(''' >>> r = open('runzeo', 'w').write('''
... import sys ... import sys
... sys.path[:] = %r ... sys.path[:] = %r
... import ZEO.runzeo ... import ZEO.runzeo
...@@ -1240,10 +1240,11 @@ def runzeo_without_configfile(): ...@@ -1240,10 +1240,11 @@ def runzeo_without_configfile():
... ''' % sys.path) ... ''' % sys.path)
>>> import subprocess, re >>> import subprocess, re
>>> print(re.sub('\d\d+|[:]', '', subprocess.Popen( >>> print(re.sub(b'\d\d+|[:]', b'', subprocess.Popen(
... [sys.executable, 'runzeo', '-a:%s' % get_port(), '-ft', '--test'], ... [sys.executable, 'runzeo', '-a:%s' % get_port(), '-ft', '--test'],
... stdout=subprocess.PIPE, stderr=subprocess.STDOUT, ... stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
... ).stdout.read())) # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE ... ).stdout.read()).decode('ascii'))
... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
------ ------
--T INFO ZEO.runzeo () opening storage '1' using FileStorage --T INFO ZEO.runzeo () opening storage '1' using FileStorage
------ ------
......
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