( )⚙ D2280 remotenames: port partway to python3 by using collections.MutableMapping

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2280

remotenames: port partway to python3 by using collections.MutableMapping
ClosedPublic

Authored by durin42 on Feb 15 2018, 9:18 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGe37be270e163: remotenames: port partway to python3 by using collections.MutableMapping
rHG25a7d2761898: remotenames: port partway to python3 by using collections.MutableMapping
Summary

test-logexchange.t doesn't pass after this, but at least the
remotenames extension can be imported.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 15 2018, 9:18 AM
durin42 added inline comments.Feb 15 2018, 9:19 AM
hgext/remotenames.py
25–28

This import style irritates the import checker. We could do

try

import UserDict
dictmixin = DictMixin

except

import collections
dictmixin = collections.MutableMapping

would that be preferable?

yuja added a subscriber: yuja.Feb 15 2018, 9:38 AM

"would that be preferable?"

Perhaps. We'll need that anyway to get around demandimport.

durin42 added a comment.Feb 15 2018, 10:47 AM
In D2280#37674, @yuja wrote:

"would that be preferable?"
Perhaps. We'll need that anyway to get around demandimport.

I don't think we do (python3 demandimport is slightly nicer in this regard), but I've done it anyway since it helps the import checker.

durin42 updated this revision to Diff 5764.Feb 15 2018, 10:47 AM
durin42 updated this revision to Diff 5768.Feb 15 2018, 12:54 PM
dlax added a subscriber: dlax.Feb 16 2018, 3:06 AM
dlax added inline comments.
hgext/remotenames.py
30

collections.MutableMapping exists on Python2 as well (from 2.6 apparently), can't we use it?

durin42 marked an inline comment as done.Feb 16 2018, 5:04 PM
durin42 retitled this revision from remotenames: port partway to python3 to remotenames: port partway to python3 by using collections.MutableMapping.
durin42 updated this revision to Diff 5785.
yuja accepted this revision.Feb 16 2018, 10:37 PM
This revision is now accepted and ready to land.Feb 16 2018, 10:37 PM
Closed by commit rHG25a7d2761898: remotenames: port partway to python3 by using collections.MutableMapping (authored by durin42). · Explain WhyFeb 16 2018, 10:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/remotenames.py (19 lines)

Diff 5762

hgext/remotenames.py

Boolean value to enable or disable showing of remotebookmarks Boolean value to enable or disable showing of remotebookmarks
remotenames.branches remotenames.branches
Boolean value to enable or disable showing of remotebranches Boolean value to enable or disable showing of remotebranches
""" """
from __future__ import absolute_import from __future__ import absolute_import
import UserDict try:
from UserDict import DictMixin
except ImportError:
from collections import MutableMapping as DictMixin
durin42AuthorUnsubmitted
Not Done

This import style irritates the import checker. We could do

try

import UserDict
dictmixin = DictMixin

except

import collections
dictmixin = collections.MutableMapping

would that be preferable?

durin42: This import style irritates the import checker. We could do try import UserDict dictmixin…
from mercurial.i18n import _ from mercurial.i18n import _
dlaxUnsubmitted
Done

collections.MutableMapping exists on Python2 as well (from 2.6 apparently), can't we use it?

dlax: `collections.MutableMapping` exists on Python2 as well (from 2.6 apparently), can't we use it?
from mercurial.node import ( from mercurial.node import (
bin, bin,
) )
from mercurial import ( from mercurial import (
logexchange, logexchange,
namespaces, namespaces,
pycompat, pycompat,
configitem('remotenames', 'bookmarks', configitem('remotenames', 'bookmarks',
default=True, default=True,
) )
configitem('remotenames', 'branches', configitem('remotenames', 'branches',
default=True, default=True,
) )
class lazyremotenamedict(UserDict.DictMixin): class lazyremotenamedict(DictMixin):
""" """
Read-only dict-like Class to lazily resolve remotename entries Read-only dict-like Class to lazily resolve remotename entries
We are doing that because remotenames startup was slow. We are doing that because remotenames startup was slow.
We lazily read the remotenames file once to figure out the potential entries We lazily read the remotenames file once to figure out the potential entries
and store them in self.potentialentries. Then when asked to resolve an and store them in self.potentialentries. Then when asked to resolve an
entry, if it is not in self.potentialentries, then it isn't there, if it entry, if it is not in self.potentialentries, then it isn't there, if it
is in self.potentialentries we resolve it and store the result in is in self.potentialentries we resolve it and store the result in
if not self.loaded: if not self.loaded:
self._load() self._load()
val = self._fetchandcache(key) val = self._fetchandcache(key)
if val is not None: if val is not None:
return val return val
else: else:
raise KeyError() raise KeyError()
def __iter__(self):
return iter(self.potentialentries)
def __len__(self):
return len(self.potentialentries)
def __setitem__(self):
raise NotImplementedError
def __delitem__(self):
raise NotImplementedError
def _fetchandcache(self, key): def _fetchandcache(self, key):
if key in self.cache: if key in self.cache:
return self.cache[key] return self.cache[key]
val = self._resolvedata(key) val = self._resolvedata(key)
if val is not None: if val is not None:
self.cache[key] = val self.cache[key] = val
return val return val
else: else: