This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5018

py3: flush stdout
ClosedPublic

Authored by indygreg on Oct 12 2018, 1:25 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG9cc411952ab9: py3: flush stdout

Summary

This avoids buffering due to mixed print() and sys.stdout.write() by
profiling code.

And with this, test-profile.t passes on Python 3 \o/.

Honestly, I'd be shocked if there weren't more Python 3 encoding issues lingering
in the profiling code. That code isn't super high quality and doesn't seem to have
thorough test coverage.

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, 1:25 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 12 2018, 1:25 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

pulkit accepted this revision.Oct 12 2018, 4:39 PM

Closed by commit rHG9cc411952ab9: py3: flush stdout (authored by indygreg). · Explain WhyOct 12 2018, 5:02 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-profile.t (3 lines)

Status	Author	Revision
Closed	indygreg	D5018 py3: flush stdout
Closed	indygreg	D5017 py3: use raw strings in statprof.py
Closed	indygreg	D5016 py3: sprinkle statprof.py with utf-8 encoding
Closed	indygreg	D5015 py3: switch from print(..., file=) to write()
Closed	indygreg	D5014 py3: use %d in a few places
Closed	indygreg	D5013 py3: use raw strings for stack names
Closed	indygreg	D5012 py3: use sysbytes for converting code attributes
Closed	indygreg	D5011 py3: use write() instead of print()
Closed	indygreg	D5010 py3: encode str to bytes
Closed	indygreg	D5009 py3: use %d to format ints
Closed	indygreg	D5008 py3: convert sorting field to sysstr
Closed	indygreg	D5007 py3: encode json output to bytes and use write()

Diff 11953

tests/test-profile.t

	$ cd ..			$ cd ..

	#if no-chg			#if no-chg
	profiler extension could be loaded before other extensions			profiler extension could be loaded before other extensions

	$ cat > fooprof.py <<EOF			$ cat > fooprof.py <<EOF
	> from __future__ import absolute_import			> from __future__ import absolute_import
	> import contextlib			> import contextlib
				> import sys
	> @contextlib.contextmanager			> @contextlib.contextmanager
	> def profile(ui, fp):			> def profile(ui, fp):
	> print('fooprof: start profile')			> print('fooprof: start profile')
				> sys.stdout.flush()
	> yield			> yield
	> print('fooprof: end profile')			> print('fooprof: end profile')
				> sys.stdout.flush()
	> def extsetup(ui):			> def extsetup(ui):
	> ui.write(b'fooprof: loaded\n')			> ui.write(b'fooprof: loaded\n')
	> EOF			> EOF

	$ cat > otherextension.py <<EOF			$ cat > otherextension.py <<EOF
	> from __future__ import absolute_import			> from __future__ import absolute_import
	> def extsetup(ui):			> def extsetup(ui):
	> ui.write(b'otherextension: loaded\n')			> ui.write(b'otherextension: loaded\n')

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	11931		Oct 12 2018, 1:25 PM	★	★
Diff 2	11953	rHG9cc411952ab99aa24ff58eefc590ba70223560ee	Oct 12 2018, 1:17 PM	★	★