Mercurial > hg-stable
changeset 33746:27fb986e54d0
tests: fix simple heredoc print statements to work on Py3
There are a handful left that require some more care.
Differential Revision: https://phab.mercurial-scm.org/D293
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 15 Jun 2017 13:32:32 -0400 |
| parents | 388901a15bfa |
| children | 24849d53697d |
| files | tests/test-hgweb-no-path-info.t tests/test-hgweb-no-request-uri.t tests/test-hgweb-non-interactive.t tests/test-repair-strip.t |
| diffstat | 4 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-hgweb-no-path-info.t Mon Jul 24 10:37:39 2017 -0400 +++ b/tests/test-hgweb-no-path-info.t Thu Jun 15 13:32:32 2017 -0400 @@ -31,11 +31,11 @@ > input = stringio() > > def startrsp(status, headers): - > print '---- STATUS' - > print status - > print '---- HEADERS' - > print [i for i in headers if i[0] != 'ETag'] - > print '---- DATA' + > print('---- STATUS') + > print(status) + > print('---- HEADERS') + > print([i for i in headers if i[0] != 'ETag']) + > print('---- DATA') > return output.write > > env = { @@ -59,8 +59,8 @@ > sys.stdout.write(output.getvalue()) > sys.stdout.write(''.join(content)) > getattr(content, 'close', lambda : None)() - > print '---- ERRORS' - > print errors.getvalue() + > print('---- ERRORS') + > print(errors.getvalue()) > > output = stringio() > env['QUERY_STRING'] = 'style=atom'
--- a/tests/test-hgweb-no-request-uri.t Mon Jul 24 10:37:39 2017 -0400 +++ b/tests/test-hgweb-no-request-uri.t Thu Jun 15 13:32:32 2017 -0400 @@ -31,11 +31,11 @@ > input = stringio() > > def startrsp(status, headers): - > print '---- STATUS' - > print status - > print '---- HEADERS' - > print [i for i in headers if i[0] != 'ETag'] - > print '---- DATA' + > print('---- STATUS') + > print(status) + > print('---- HEADERS') + > print([i for i in headers if i[0] != 'ETag']) + > print('---- DATA') > return output.write > > env = { @@ -58,8 +58,8 @@ > sys.stdout.write(output.getvalue()) > sys.stdout.write(''.join(content)) > getattr(content, 'close', lambda : None)() - > print '---- ERRORS' - > print errors.getvalue() + > print('---- ERRORS') + > print(errors.getvalue()) > > output = stringio() > env['PATH_INFO'] = '/'
--- a/tests/test-hgweb-non-interactive.t Mon Jul 24 10:37:39 2017 -0400 +++ b/tests/test-hgweb-non-interactive.t Thu Jun 15 13:32:32 2017 -0400 @@ -41,11 +41,11 @@ > output = stringio() > > def startrsp(status, headers): - > print '---- STATUS' - > print status - > print '---- HEADERS' - > print [i for i in headers if i[0] != 'ETag'] - > print '---- DATA' + > print('---- STATUS') + > print(status) + > print('---- HEADERS') + > print([i for i in headers if i[0] != 'ETag']) + > print('---- DATA') > return output.write > > env = { @@ -68,13 +68,13 @@ > i = hgweb('.') > for c in i(env, startrsp): > pass - > print '---- ERRORS' - > print errors.getvalue() - > print '---- OS.ENVIRON wsgi variables' - > print sorted([x for x in os.environ if x.startswith('wsgi')]) - > print '---- request.ENVIRON wsgi variables' + > print('---- ERRORS') + > print(errors.getvalue()) + > print('---- OS.ENVIRON wsgi variables') + > print(sorted([x for x in os.environ if x.startswith('wsgi')])) + > print('---- request.ENVIRON wsgi variables') > with i._obtainrepo() as repo: - > print sorted([x for x in repo.ui.environ if x.startswith('wsgi')]) + > print(sorted([x for x in repo.ui.environ if x.startswith('wsgi')])) > EOF $ $PYTHON request.py ---- STATUS
--- a/tests/test-repair-strip.t Mon Jul 24 10:37:39 2017 -0400 +++ b/tests/test-repair-strip.t Thu Jun 15 13:32:32 2017 -0400 @@ -4,7 +4,7 @@ > import sys > for entry in sys.stdin.read().split('\n'): > if entry: - > print entry.split('\x00')[0] + > print(entry.split('\x00')[0]) > EOF $ echo "[extensions]" >> $HGRCPATH