This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6641

py3: source-transform only call-sites of iteritems(), not definitions
ClosedPublic

Authored by martinvonz on Jul 13 2019, 3:11 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3018749a71bb: py3: source-transform only call-sites of iteritems(), not definitions
rHG5a6ba3165736: py3: source-transform only call-sites of iteritems(), not definitions
Summary

branchmap.branchcache, among other classes, defines a
iteritems(). That currently gets replaced by items() by the source
transformer. That makes it harder for extensions to work with both py2
and py3, since they have to call either items() or iteritems() on
branchcache. Let's not replace definitions of iteritems() (and
itervalues()) and only replace the call-sites. We need to also add an
items() alias to branchcache (etc) so our transformer call-sites will
find it.

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

martinvonz created this revision.Jul 13 2019, 3:11 AM
pulkit accepted this revision.Jul 15 2019, 9:33 AM
This revision is now accepted and ready to land.Jul 15 2019, 9:33 AM
yuja added a subscriber: yuja.Jul 15 2019, 7:39 PM
  • a/mercurial/__init__.py

+++ b/mercurial/__init__.py
@@ -225,7 +225,9 @@

    1. It changes iteritems/values to items/values as they are not
    2. present in Python 3 world.
  • elif fn in ('iteritems', 'itervalues'):

+ elif (fn in ('iteritems', 'itervalues') and
+ not (tokens[i - 1].type == token.NAME and
+ tokens[i - 1].string == 'def')):

Perhaps, we need to bump the BYTECODEHEADER version to recompile all
py3 modules.

martinvonz added a comment.Jul 15 2019, 7:42 PM
In D6641#97205, @yuja wrote:
  • a/mercurial/__init__.py

+++ b/mercurial/__init__.py
@@ -225,7 +225,9 @@

    1. It changes iteritems/values to items/values as they are not
    2. present in Python 3 world.
  • elif fn in ('iteritems', 'itervalues'):

+ elif (fn in ('iteritems', 'itervalues') and
+ not (tokens[i - 1].type == token.NAME and
+ tokens[i - 1].string == 'def')):

Perhaps, we need to bump the BYTECODEHEADER version to recompile all
py3 modules.

Oops, I missed that despite the the big all-caps message. Thanks for pointing that out. I'll fix it in flight (changing HG\x00\x0b to HG\x00\x0c).

Revision Contents
Changeset List

PathPackages
Mhgext/remotenames.py (2 lines)
Mmercurial/__init__.py (4 lines)
Mmercurial/branchmap.py (2 lines)

Diff 15910

hgext/remotenames.py

""" Iterate over (name, node) tuples """ """ Iterate over (name, node) tuples """
if not self.loaded: if not self.loaded:
self._load() self._load()
for k, vtup in self.potentialentries.iteritems(): for k, vtup in self.potentialentries.iteritems():
yield (k, [bin(vtup[0])]) yield (k, [bin(vtup[0])])
items = iteritems
class remotenames(object): class remotenames(object):
""" """
This class encapsulates all the remotenames state. It also contains This class encapsulates all the remotenames state. It also contains
methods to access that state in convenient ways. Remotenames are lazy methods to access that state in convenient ways. Remotenames are lazy
loaded. Whenever client code needs to ensure the freshest copy of loaded. Whenever client code needs to ensure the freshest copy of
remotenames, use the `clearnames` method to force an eventual load. remotenames, use the `clearnames` method to force an eventual load.
""" """

mercurial/__init__.py

elif fn in ('encode', 'decode') and _isop(i - 1, '.'): elif fn in ('encode', 'decode') and _isop(i - 1, '.'):
for argn in range(2): for argn in range(2):
argidx = _findargnofcall(argn) argidx = _findargnofcall(argn)
if argidx is not None: if argidx is not None:
_ensureunicode(argidx) _ensureunicode(argidx)
# It changes iteritems/values to items/values as they are not # It changes iteritems/values to items/values as they are not
# present in Python 3 world. # present in Python 3 world.
elif fn in ('iteritems', 'itervalues'): elif (fn in ('iteritems', 'itervalues') and
not (tokens[i - 1].type == token.NAME and
tokens[i - 1].string == 'def')):
yield t._replace(string=fn[4:]) yield t._replace(string=fn[4:])
continue continue
# Emit unmodified token. # Emit unmodified token.
yield t yield t
# Header to add to bytecode files. This MUST be changed when # Header to add to bytecode files. This MUST be changed when
# ``replacetoken`` or any mechanism that changes semantics of module # ``replacetoken`` or any mechanism that changes semantics of module

mercurial/branchmap.py

self._verifybranch(key) self._verifybranch(key)
return key in self._entries return key in self._entries
def iteritems(self): def iteritems(self):
for k, v in self._entries.iteritems(): for k, v in self._entries.iteritems():
self._verifybranch(k) self._verifybranch(k)
yield k, v yield k, v
items = iteritems
def hasbranch(self, label): def hasbranch(self, label):
""" checks whether a branch of this name exists or not """ """ checks whether a branch of this name exists or not """
self._verifybranch(label) self._verifybranch(label)
return label in self._entries return label in self._entries
@classmethod @classmethod
def fromfile(cls, repo): def fromfile(cls, repo):
f = None f = None