This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3504

cborutil: port to Python 3
ClosedPublic

Authored by durin42 on May 8 2018, 3:27 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2ae6a3134362: cborutil: port to Python 3
Summary

The only problem lurking in here was sorts of mismatched types. The
sorts are only for output stability in our tests (sigh), so we just
build a phony sort key using the name of types so that we only
compare like types against each other. By pure luck, my awful sort key
matches the behavior we get "for free" in Python 2, so no test output
changes.

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

durin42 created this revision.May 8 2018, 3:27 PM
indygreg accepted this revision.May 8 2018, 4:18 PM
indygreg added a subscriber: indygreg.

Ugh.

This revision is now accepted and ready to land.May 8 2018, 4:18 PM
Closed by commit rHG2ae6a3134362: cborutil: port to Python 3 (authored by durin42). · Explain WhyMay 8 2018, 4:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/cborutil.py (8 lines)

Diff 8580

mercurial/utils/cborutil.py

yield BEGIN_INDEFINITE_ARRAY yield BEGIN_INDEFINITE_ARRAY
for i in it: for i in it:
for chunk in streamencode(i): for chunk in streamencode(i):
yield chunk yield chunk
yield BREAK yield BREAK
def _mixedtypesortkey(v):
return type(v).__name__, v
def streamencodeset(s): def streamencodeset(s):
# https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml defines # https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml defines
# semantic tag 258 for finite sets. # semantic tag 258 for finite sets.
yield encodelength(MAJOR_TYPE_SEMANTIC, 258) yield encodelength(MAJOR_TYPE_SEMANTIC, 258)
for chunk in streamencodearray(sorted(s)): for chunk in streamencodearray(sorted(s, key=_mixedtypesortkey)):
yield chunk yield chunk
def streamencodemap(d): def streamencodemap(d):
"""Encode dictionary to a generator. """Encode dictionary to a generator.
Does not supporting indefinite length dictionaries. Does not supporting indefinite length dictionaries.
""" """
yield encodelength(MAJOR_TYPE_MAP, len(d)) yield encodelength(MAJOR_TYPE_MAP, len(d))
for key, value in sorted(d.iteritems()): for key, value in sorted(d.iteritems(),
key=lambda x: _mixedtypesortkey(x[0])):
for chunk in streamencode(key): for chunk in streamencode(key):
yield chunk yield chunk
for chunk in streamencode(value): for chunk in streamencode(value):
yield chunk yield chunk
def streamencodemapfromiter(it): def streamencodemapfromiter(it):
"""Given an iterable of (key, value), encode to an indefinite length map.""" """Given an iterable of (key, value), encode to an indefinite length map."""
yield BEGIN_INDEFINITE_MAP yield BEGIN_INDEFINITE_MAP