This is an archive of the discontinued Mercurial Phabricator instance.

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
400	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.

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

			Path	Packages
M			mercurial/extensions.py (1 line)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	679		Aug 9 2017, 10:24 AM	★	★
Diff 2	799		Aug 11 2017, 3:52 PM	★	★
Diff 3	945		Aug 15 2017, 4:18 PM	★	★
Diff 4	968	rHG38a3767975a78436fddc11a64b6e6efb09dc0a0e	Jul 25 2017, 10:49 PM	★	★

Status	Author	Revision
Closed	durin42	D279 tests: fix test-notify.t to use $PYTHON
Closed	durin42	D278 tests: make test-highlight code portable to python3
Closed	durin42	D277 dagparser: make print statement in doctest Py3 portable
Closed	durin42	D276 i18n: fix check-translation.py to be less broken on Python 3
Closed	durin42	D275 ui: refactor extractchoices so it doesn't break on Python 3
Closed	durin42	D274 obsutil: defend against succsmarkers() returning None
Closed	durin42	D273 changegroup: more **kwargs
Closed	durin42	D272 bundle2: convert ints to strings using pycompat.bytestring()
Closed	durin42	D302 python3: whitelist another 13 tests that now pass
Closed	durin42	D301 scmutil: use util.shellquote instead of %r
Abandoned	durin42	D300 python3: whitelist four more passing tests
Closed	durin42	D299 py3: introduce a wrapper for __builtins__.{raw_,}input()
Closed	durin42	D298 python3: whitelist four more passing tests
Closed	durin42	D297 tests: update duplicateoptions test to use bytestrings everywhere
Closed	durin42	D353 extensions: don't give AttributeError bytes message on Python 3
Closed	durin42	D296 extensions: if on py3 and propname is a bytestr, convert to sysstr
Closed	durin42	D295 extensions: attempt to use non-deprecated inspect method
Closed	durin42	D294 tests: clean up many print statements to be print functions instead
Closed	durin42	D293 tests: fix simple heredoc print statements to work on Py3
Closed	durin42	D271 obsolete: use bytes() instead of str() so the node is bytes on py3
Closed	durin42	D270 tests: fix up test-run-tests failures on Python 3.6

Diff 968

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.
	"""			"""
				propname = pycompat.sysstr(propname)
	assert callable(wrapper)			assert callable(wrapper)
				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.
	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

This is an archive of the discontinued Mercurial Phabricator instance.

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

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 968

mercurial/extensions.py

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

Revision Contents
Changeset List