diff --git a/hgext/remotenames.py b/hgext/remotenames.py --- a/hgext/remotenames.py +++ b/hgext/remotenames.py @@ -167,6 +167,8 @@ for k, vtup in self.potentialentries.iteritems(): yield (k, [bin(vtup[0])]) + items = iteritems + class remotenames(object): """ This class encapsulates all the remotenames state. It also contains diff --git a/mercurial/__init__.py b/mercurial/__init__.py --- a/mercurial/__init__.py +++ b/mercurial/__init__.py @@ -225,7 +225,9 @@ # It changes iteritems/values to items/values as they are not # 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:]) continue diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py --- a/mercurial/branchmap.py +++ b/mercurial/branchmap.py @@ -212,6 +212,8 @@ self._verifybranch(k) yield k, v + items = iteritems + def hasbranch(self, label): """ checks whether a branch of this name exists or not """ self._verifybranch(label)