This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4965

py3: encode JSON str to bytes
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfe11fc7e541f: py3: encode JSON str to bytes
Summary

json.dumps() will emit UTF-8 str on Python 2 and 3. Use sysbytes to
force the .encode('utf-8') on Python 3 and no-op on Python 2.

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
pulkit accepted this revision.Oct 12 2018, 4:20 AM
Closed by commit rHGfe11fc7e541f: py3: encode JSON str to bytes (authored by indygreg). · Explain WhyOct 12 2018, 4:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/get-with-headers.py (3 lines)

Diff 11850

tests/get-with-headers.py

#!/usr/bin/env python #!/usr/bin/env python
"""This does HTTP GET requests given a host:port and path and returns """This does HTTP GET requests given a host:port and path and returns
a subset of the headers plus the body of the result.""" a subset of the headers plus the body of the result."""
from __future__ import absolute_import from __future__ import absolute_import
import argparse import argparse
import json import json
import os import os
import sys import sys
from mercurial import ( from mercurial import (
pycompat,
util, util,
) )
httplib = util.httplib httplib = util.httplib
try: try:
import msvcrt import msvcrt
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
# Pretty print JSON. This also has the beneficial side-effect # Pretty print JSON. This also has the beneficial side-effect
# of verifying emitted JSON is well-formed. # of verifying emitted JSON is well-formed.
if formatjson: if formatjson:
# json.dumps() will print trailing newlines. Eliminate them # json.dumps() will print trailing newlines. Eliminate them
# to make tests easier to write. # to make tests easier to write.
data = json.loads(data) data = json.loads(data)
lines = json.dumps(data, sort_keys=True, indent=2).splitlines() lines = json.dumps(data, sort_keys=True, indent=2).splitlines()
for line in lines: for line in lines:
bodyfh.write(line.rstrip()) bodyfh.write(pycompat.sysbytes(line.rstrip()))
bodyfh.write(b'\n') bodyfh.write(b'\n')
else: else:
bodyfh.write(data) bodyfh.write(data)
if args.bodyfile: if args.bodyfile:
bodyfh.close() bodyfh.close()
if twice and response.getheader('ETag', None): if twice and response.getheader('ETag', None):