This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4972

py3: tweak stdout writing in test-hgweb-no-path-info.t
ClosedPublic

Authored by indygreg on Oct 12 2018, 4:09 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3eea8e83c261: py3: tweak stdout writing in test-hgweb-no-path-info.t
Summary

We want to write bytes for convenience. This requires sys.stdout.buffer.
But using sys.stdout.buffer introducing buffered output. So we sprinkle
code with sys.stdout.flush() to force immediate writes.

After all that, Python 3 was emitting b'' prefixed output for errors.
So we only print errors if there were some. There aren't, so b'' don't
come into play and output is identical in Python 2 and 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Oct 12 2018, 4:09 AM
Closed by commit rHG3eea8e83c261: py3: tweak stdout writing in test-hgweb-no-path-info.t (authored by indygreg). · Explain WhyOct 12 2018, 6:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-hgweb-no-path-info.t (20 lines)

Diff 11861

tests/test-hgweb-no-path-info.t

> input = stringio() > input = stringio()
> >
> def startrsp(status, headers): > def startrsp(status, headers):
> print('---- STATUS') > print('---- STATUS')
> print(status) > print(status)
> print('---- HEADERS') > print('---- HEADERS')
> print([i for i in headers if i[0] != 'ETag']) > print([i for i in headers if i[0] != 'ETag'])
> print('---- DATA') > print('---- DATA')
> sys.stdout.flush()
> return output.write > return output.write
> >
> env = { > env = {
> 'wsgi.version': (1, 0), > 'wsgi.version': (1, 0),
> 'wsgi.url_scheme': 'http', > 'wsgi.url_scheme': 'http',
> 'wsgi.errors': errors, > 'wsgi.errors': errors,
> 'wsgi.input': input, > 'wsgi.input': input,
> 'wsgi.multithread': False, > 'wsgi.multithread': False,
> 'wsgi.multiprocess': False, > 'wsgi.multiprocess': False,
> 'wsgi.run_once': False, > 'wsgi.run_once': False,
> 'REQUEST_METHOD': 'GET', > 'REQUEST_METHOD': 'GET',
> 'PATH_INFO': '/', > 'PATH_INFO': '/',
> 'SCRIPT_NAME': '', > 'SCRIPT_NAME': '',
> 'SERVER_NAME': '$LOCALIP', > 'SERVER_NAME': '$LOCALIP',
> 'SERVER_PORT': os.environ['HGPORT'], > 'SERVER_PORT': os.environ['HGPORT'],
> 'SERVER_PROTOCOL': 'HTTP/1.0' > 'SERVER_PROTOCOL': 'HTTP/1.0'
> } > }
> >
> def process(app): > def process(app):
> try:
> stdout = sys.stdout.buffer
> except AttributeError:
> stdout = sys.stdout
> content = app(env, startrsp) > content = app(env, startrsp)
> sys.stdout.write(output.getvalue()) > stdout.write(output.getvalue())
> sys.stdout.write(''.join(content)) > stdout.write(b''.join(content))
> stdout.flush()
> getattr(content, 'close', lambda : None)() > getattr(content, 'close', lambda : None)()
> if errors.getvalue():
> print('---- ERRORS') > print('---- ERRORS')
> print(errors.getvalue()) > print(errors.getvalue())
> sys.stdout.flush()
> >
> output = stringio() > output = stringio()
> env['QUERY_STRING'] = 'style=atom' > env['QUERY_STRING'] = 'style=atom'
> process(hgweb(b'.', name=b'repo')) > process(hgweb(b'.', name=b'repo'))
> >
> output = stringio() > output = stringio()
> env['QUERY_STRING'] = 'style=raw' > env['QUERY_STRING'] = 'style=raw'
> process(hgwebdir({b'repo': b'.'})) > process(hgwebdir({b'repo': b'.'}))
<th style="text-align:left;vertical-align:top;">files</th> <th style="text-align:left;vertical-align:top;">files</th>
<td>bar<br /></td> <td>bar<br /></td>
</tr> </tr>
</table> </table>
</content> </content>
</entry> </entry>
</feed> </feed>
---- ERRORS
---- STATUS ---- STATUS
200 Script output follows 200 Script output follows
---- HEADERS ---- HEADERS
[('Content-Type', 'text/plain; charset=ascii')] [('Content-Type', 'text/plain; charset=ascii')]
---- DATA ---- DATA
/repo/ /repo/
---- ERRORS
$ cd .. $ cd ..