( )⚙ D3368 stringutil: ast.literal_eval needs a unicode on py3

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3368

stringutil: ast.literal_eval needs a unicode on py3
ClosedPublic

Authored by durin42 on Apr 14 2018, 1:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3942bd8db8b2: stringutil: ast.literal_eval needs a unicode on py3
Summary

Fortunately for us, this is really only used internally, so we can be
lazy about the encoding here.

test-wireproto-framing.py now passes on Python 3.

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.Apr 14 2018, 1:37 AM
Closed by commit rHG3942bd8db8b2: stringutil: ast.literal_eval needs a unicode on py3 (authored by durin42). · Explain WhyApr 14 2018, 8:14 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8264

contrib/python3-whitelist

test-update-names.t test-update-names.t
test-update-reverse.t test-update-reverse.t
test-upgrade-repo.t test-upgrade-repo.t
test-url-rev.t test-url-rev.t
test-username-newline.t test-username-newline.t
test-verify.t test-verify.t
test-websub.t test-websub.t
test-win32text.t test-win32text.t
test-wireproto-framing.py
test-xdg.t test-xdg.t

mercurial/utils/stringutil.py

If s is not a valid boolean, returns None. If s is not a valid boolean, returns None.
""" """
return _booleans.get(s.lower(), None) return _booleans.get(s.lower(), None)
def evalpythonliteral(s): def evalpythonliteral(s):
"""Evaluate a string containing a Python literal expression""" """Evaluate a string containing a Python literal expression"""
# We could backport our tokenizer hack to rewrite '' to u'' if we want # We could backport our tokenizer hack to rewrite '' to u'' if we want
if pycompat.ispy3:
return ast.literal_eval(s.decode('latin1'))
return ast.literal_eval(s) return ast.literal_eval(s)