This is an archive of the discontinued Mercurial Phabricator instance.

Differential D296

extensions: if on py3 and propname is a bytestr, convert to sysstr
ClosedPublic

Authored by durin42 on Aug 9 2017, 10:24 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG38a3767975a7: extensions: if on py3 and propname is a bytestr, convert to sysstr
Summary

Property names are unicodes on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Aug 9 2017, 10:24 AM
yuja added a subscriber: yuja.Aug 9 2017, 11:17 AM
yuja added inline comments.
mercurial/extensions.py
388

pycompat.sysstr() ?

401

Perhaps this shouldn't be bytes. Needs r'' and drop _().

durin42 marked 2 inline comments as done.Aug 11 2017, 3:52 PM
durin42 retitled this revision from extensions: if on py3 and propname is a bytestr, decode as ascii to extensions: if on py3 and propname is a bytestr, convert to sysstr.
durin42 added a child revision: D353: extensions: don't give AttributeError bytes message on Python 3.
durin42 updated this revision to Diff 799.
durin42 added inline comments.Aug 11 2017, 3:52 PM
mercurial/extensions.py
401

Done in a followup change.

yuja added inline comments.Aug 12 2017, 6:21 AM
mercurial/extensions.py
388

The "if" shouldn't be necessary. That's what sysstr() is for.

durin42 marked 2 inline comments as done.Aug 15 2017, 4:18 PM
durin42 updated this revision to Diff 945.
durin42 added a comment.Aug 15 2017, 4:20 PM

Take another look?

Closed by commit rHG38a3767975a7: extensions: if on py3 and propname is a bytestr, convert to sysstr (authored by durin42). · Explain WhyAug 15 2017, 11:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/extensions.py (2 lines)

Diff 679

mercurial/extensions.py

table[key] = tuple(newentry) table[key] = tuple(newentry)
return entry return entry
def wrapfilecache(cls, propname, wrapper): def wrapfilecache(cls, propname, wrapper):
"""Wraps a filecache property. """Wraps a filecache property.
These can't be wrapped using the normal wrapfunction. These can't be wrapped using the normal wrapfunction.
""" """
if pycompat.ispy3 and isinstance(propname, bytes):
propname = propname.decode('ascii')
yujaUnsubmitted
Done

pycompat.sysstr() ?

yuja: `pycompat.sysstr()` ?
yujaUnsubmitted
Done

The "if" shouldn't be necessary. That's what sysstr() is for.

yuja: The "if" shouldn't be necessary. That's what `sysstr()` is for.
assert callable(wrapper) assert callable(wrapper)
for currcls in cls.__mro__: for currcls in cls.__mro__:
if propname in currcls.__dict__: if propname in currcls.__dict__:
origfn = currcls.__dict__[propname].func origfn = currcls.__dict__[propname].func
assert callable(origfn) assert callable(origfn)
def wrap(*args, **kwargs): def wrap(*args, **kwargs):
return wrapper(origfn, *args, **kwargs) return wrapper(origfn, *args, **kwargs)
currcls.__dict__[propname].func = wrap currcls.__dict__[propname].func = wrap
break break
if currcls is object: if currcls is object:
raise AttributeError( raise AttributeError(
_("type '%s' has no property '%s'") % (cls, propname)) _("type '%s' has no property '%s'") % (cls, propname))
yujaUnsubmitted
Done

Perhaps this shouldn't be bytes. Needs r'' and drop _().

yuja: Perhaps this shouldn't be bytes. Needs `r''` and drop `_()`.
durin42AuthorUnsubmitted
Done

Done in a followup change.

durin42: Done in a followup change.
def wrapfunction(container, funcname, wrapper): def wrapfunction(container, funcname, wrapper):
'''Wrap the function named funcname in container '''Wrap the function named funcname in container
Replace the funcname member in the given container with the specified Replace the funcname member in the given container with the specified
wrapper. The container is typically a module, class, or instance. wrapper. The container is typically a module, class, or instance.
The wrapper will be called like The wrapper will be called like