This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10276

typing: make minor adjustments to mercurial/util.py to pass pytype checking
ClosedPublic

Authored by mharbison72 on Mar 26 2021, 12:39 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG51841b23670b: typing: make minor adjustments to mercurial/util.py to pass pytype checking
Summary

I'm assuming the wrong-arg-count is a pytype bug, because this code is used by
the config object. Avoiding initializing _lrucachenode node points to None
eliminates a few is not None assertions, but apparently not all of them. I
can't figure out why it gets confused over the state where these new assertions
are.

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

mharbison72 created this revision.Mar 26 2021, 12:39 AM
pulkit accepted this revision.Apr 11 2021, 5:28 PM
This revision is now accepted and ready to land.Apr 11 2021, 5:28 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (15 lines)
Mtests/test-check-pytype.t (1 line)

Diff 26813

mercurial/util.py

Call preparewrite before doing any writes. Call preparewrite before doing any writes.
""" """
def preparewrite(self): def preparewrite(self):
"""call this before writes, return self or a copied new object""" """call this before writes, return self or a copied new object"""
if getattr(self, '_copied', 0): if getattr(self, '_copied', 0):
self._copied -= 1 self._copied -= 1
return self.__class__(self) # Function cow.__init__ expects 1 arg(s), got 2 [wrong-arg-count]
return self.__class__(self) # pytype: disable=wrong-arg-count
return self return self
def copy(self): def copy(self):
"""always do a cheap copy""" """always do a cheap copy"""
self._copied = getattr(self, '_copied', 0) + 1 self._copied = getattr(self, '_copied', 0) + 1
return self return self
Holds a reference to nodes on either side as well as a key-value Holds a reference to nodes on either side as well as a key-value
pair for the dictionary entry. pair for the dictionary entry.
""" """
__slots__ = ('next', 'prev', 'key', 'value', 'cost') __slots__ = ('next', 'prev', 'key', 'value', 'cost')
def __init__(self): def __init__(self):
self.next = None self.next = self
self.prev = None self.prev = self
self.key = _notset self.key = _notset
self.value = None self.value = None
self.cost = 0 self.cost = 0
def markempty(self): def markempty(self):
"""Mark the node as emptied.""" """Mark the node as emptied."""
self.key = _notset self.key = _notset
nodes will be evicted to make room for the new code. This can be used nodes will be evicted to make room for the new code. This can be used
to e.g. set a max memory limit and associate an estimated bytes size to e.g. set a max memory limit and associate an estimated bytes size
cost to each item in the cache. By default, no maximum cost is enforced. cost to each item in the cache. By default, no maximum cost is enforced.
""" """
def __init__(self, max, maxcost=0): def __init__(self, max, maxcost=0):
self._cache = {} self._cache = {}
self._head = head = _lrucachenode() self._head = _lrucachenode()
head.prev = head
head.next = head
self._size = 1 self._size = 1
self.capacity = max self.capacity = max
self.totalcost = 0 self.totalcost = 0
self.maxcost = maxcost self.maxcost = maxcost
def __len__(self): def __len__(self):
return len(self._cache) return len(self._cache)
def peek(self, k, default=_notset): def peek(self, k, default=_notset):
"""Get the specified item without moving it to the head """Get the specified item without moving it to the head
Unlike get(), this doesn't mutate the internal state. But be aware Unlike get(), this doesn't mutate the internal state. But be aware
that it doesn't mean peek() is thread safe. that it doesn't mean peek() is thread safe.
""" """
try: try:
node = self._cache[k] node = self._cache[k]
assert node is not None # help pytype
return node.value return node.value
except KeyError: except KeyError:
if default is _notset: if default is _notset:
raise raise
return default return default
def clear(self): def clear(self):
n = self._head n = self._head
Returns the (key, value) describing the removed cache entry. Returns the (key, value) describing the removed cache entry.
""" """
if not self._cache: if not self._cache:
return return
# Walk the linked list backwards starting at tail node until we hit # Walk the linked list backwards starting at tail node until we hit
# a non-empty node. # a non-empty node.
n = self._head.prev n = self._head.prev
assert n is not None # help pytype
while n.key is _notset: while n.key is _notset:
n = n.prev n = n.prev
assert n is not None # help pytype assert n is not None # help pytype
key, value = n.key, n.value key, value = n.key, n.value
# And remove it from the cache and mark it as empty. # And remove it from the cache and mark it as empty.

tests/test-check-pytype.t

> -x mercurial/repoview.py \ > -x mercurial/repoview.py \
> -x mercurial/sslutil.py \ > -x mercurial/sslutil.py \
> -x mercurial/statprof.py \ > -x mercurial/statprof.py \
> -x mercurial/testing/storage.py \ > -x mercurial/testing/storage.py \
> -x mercurial/thirdparty \ > -x mercurial/thirdparty \
> -x mercurial/ui.py \ > -x mercurial/ui.py \
> -x mercurial/unionrepo.py \ > -x mercurial/unionrepo.py \
> -x mercurial/upgrade.py \ > -x mercurial/upgrade.py \
> -x mercurial/util.py \
> -x mercurial/utils/procutil.py \ > -x mercurial/utils/procutil.py \
> -x mercurial/utils/stringutil.py \ > -x mercurial/utils/stringutil.py \
> -x mercurial/utils/memorytop.py \ > -x mercurial/utils/memorytop.py \
> -x mercurial/win32.py \ > -x mercurial/win32.py \
> -x mercurial/wireprotoframing.py \ > -x mercurial/wireprotoframing.py \
> -x mercurial/wireprotoserver.py \ > -x mercurial/wireprotoserver.py \
> -x mercurial/wireprotov1peer.py \ > -x mercurial/wireprotov1peer.py \
> -x mercurial/wireprotov1server.py \ > -x mercurial/wireprotov1server.py \
> -x mercurial/wireprotov2server.py \ > -x mercurial/wireprotov2server.py \
> > $TESTTMP/pytype-output.txt || cat $TESTTMP/pytype-output.txt > > $TESTTMP/pytype-output.txt || cat $TESTTMP/pytype-output.txt
Only show the results on a failure, because the output on success is also Only show the results on a failure, because the output on success is also
voluminous and variable. voluminous and variable.