This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7674

typing: add a couple of assertions to lrucachedict to help pytype
ClosedPublic

Authored by mharbison72 on Dec 15 2019, 11:12 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb5655f337bd7: typing: add a couple of assertions to lrucachedict to help pytype
Summary

Fixes the following warnings:

line 1488, in pop: No attribute 'markempty' on None [attribute-error]
     In Optional[Union[Any, _lrucachenode, nothing]]
line 1578, in popoldest: No attribute 'markempty' on None [attribute-error]
     In Optional[Union[Any, _lrucachenode, nothing]]

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (4 lines)

Diff 18750

mercurial/util.py

def pop(self, k, default=_notset): def pop(self, k, default=_notset):
try: try:
node = self._cache.pop(k) node = self._cache.pop(k)
except KeyError: except KeyError:
if default is _notset: if default is _notset:
raise raise
return default return default
assert node is not None # help pytype
value = node.value value = node.value
self.totalcost -= node.cost self.totalcost -= node.cost
node.markempty() node.markempty()
# Temporarily mark as newest item before re-adjusting head to make # Temporarily mark as newest item before re-adjusting head to make
# this node the oldest item. # this node the oldest item.
self._movetohead(node) self._movetohead(node)
self._head = node.next self._head = node.next
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
while n.key is _notset: while n.key is _notset:
n = n.prev n = n.prev
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.
del self._cache[n.key] del self._cache[n.key]
self.totalcost -= n.cost self.totalcost -= n.cost
n.markempty() n.markempty()
return key, value return key, value