This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2156

py3: catch TypeError during template operations
ClosedPublic

Authored by indygreg on Feb 11 2018, 9:35 PM.

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHG230489fc0b41: py3: catch TypeError during template operations
Summary

Two places in this code Python 3 changed from raising ValueError
to TypeError. So catch the addition exceptions.

IMO this code might be better off performing type sniffing. But
I'm not sure the implications of changing that.

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.Feb 11 2018, 9:35 PM
pulkit accepted this revision.Feb 12 2018, 2:21 AM
durin42 accepted this revision.Feb 12 2018, 9:28 PM
This revision is now accepted and ready to land.Feb 12 2018, 9:28 PM
Closed by commit rHG230489fc0b41: py3: catch TypeError during template operations (authored by indygreg). · Explain WhyFeb 12 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/templatekw.py (8 lines)

Diff 5580

mercurial/templatekw.py

return return
startname = 'start_' + plural startname = 'start_' + plural
if startname in templ: if startname in templ:
yield templ(startname, **strmapping) yield templ(startname, **strmapping)
vmapping = mapping.copy() vmapping = mapping.copy()
def one(v, tag=name): def one(v, tag=name):
try: try:
vmapping.update(v) vmapping.update(v)
except (AttributeError, ValueError): # Python 2 raises ValueError if the type of v is wrong. Python
# 3 raises TypeError.
except (AttributeError, TypeError, ValueError):
try: try:
# Python 2 raises ValueError trying to destructure an e.g.
# bytes. Python 3 raises TypeError.
for a, b in v: for a, b in v:
vmapping[a] = b vmapping[a] = b
except ValueError: except (TypeError, ValueError):
vmapping[name] = v vmapping[name] = v
return templ(tag, **pycompat.strkwargs(vmapping)) return templ(tag, **pycompat.strkwargs(vmapping))
lastname = 'last_' + name lastname = 'last_' + name
if lastname in templ: if lastname in templ:
last = values.pop() last = values.pop()
else: else:
last = None last = None
for v in values: for v in values: