This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6781

py3: for statprof's Chrome output, write json to string, then encode to bytes
ClosedPublic

Authored by martinvonz on Aug 31 2019, 1:35 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGcd3b5be5515d: py3: for statprof's Chrome output, write json to string, then encode to bytes
rHG06e2467ff27a: py3: for statprof's Chrome output, write json to string, then encode to bytes
Summary

json.dump(obj, fp) requires fp.write() to accept str output, and
since the file pointer we have there only accepts bytes, we need to
change to json.dumps() and then encode as utf-8. We have already done
the same thing for the json (non-Chrome) format in 4b7eb862692e (py3:
encode json output to bytes and use write(), 2018-10-12).

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.

Revision Contents
Changeset List

Diff 16351

mercurial/statprof.py

sf=sid, pid=0)) sf=sid, pid=0))
laststack = collections.deque(stack) laststack = collections.deque(stack)
while laststack: while laststack:
poplast() poplast()
events = [sample for idx, sample in enumerate(samples) events = [sample for idx, sample in enumerate(samples)
if idx not in blacklist] if idx not in blacklist]
frames = collections.OrderedDict((str(k), v) frames = collections.OrderedDict((str(k), v)
for (k,v) in enumerate(id2stack)) for (k,v) in enumerate(id2stack))
json.dump(dict(traceEvents=events, stackFrames=frames), fp, indent=1) data = json.dumps(dict(traceEvents=events, stackFrames=frames), indent=1)
if not isinstance(data, bytes):
data = data.encode('utf-8')
fp.write(data)
fp.write('\n') fp.write('\n')
def printusage(): def printusage():
print(r""" print(r"""
The statprof command line allows you to inspect the last profile's results in The statprof command line allows you to inspect the last profile's results in
the following forms: the following forms:
usage: usage: