This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10122

shelve: fix conversion of exceptions to strings flagged by pytype
ClosedPublic

Authored by mharbison72 on Mar 6 2021, 7:45 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe571fec5b606: shelve: fix conversion of exceptions to strings flagged by pytype
Summary

I've seen this done several ways and don't know what's correct. But pytype was
unhappy about the previous way:

FAILED: /mnt/c/Users/Matt/hg/tests/.pytype/pyi/mercurial/shelve.pyi
/usr/bin/python3.6 -m pytype.single --imports_info /mnt/c/Users/Matt/hg/tests/.pytype/imports/mercurial.shelve.imports --module-name mercurial.shelve -V 3.6 -o /mnt/c/Users/Matt/hg/tests/.pytype/pyi/mercurial/shelve.pyi --analyze-annotated --nofail --quick /mnt/c/Users/Matt/hg/mercurial/shelve.py
File "/mnt/c/Users/Matt/hg/mercurial/shelve.py", line 244, in _verifyandtransform: Function bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: Union[KeyError, TypeError, ValueError])
File "/mnt/c/Users/Matt/hg/mercurial/shelve.py", line 253, in _getversion: Function bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: ValueError)
  The following methods aren't implemented on ValueError:
  __iter__

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 6 2021, 7:45 PM
mharbison72 added a commit: rHGe571fec5b606: shelve: fix conversion of exceptions to strings flagged by pytype.Mar 8 2021, 3:25 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe571fec5b606: shelve: fix conversion of exceptions to strings flagged by pytype (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 26129

mercurial/shelve.py

try: try:
d[b'originalwctx'] = bin(d[b'originalwctx']) d[b'originalwctx'] = bin(d[b'originalwctx'])
d[b'pendingctx'] = bin(d[b'pendingctx']) d[b'pendingctx'] = bin(d[b'pendingctx'])
d[b'parents'] = [bin(h) for h in d[b'parents'].split(b' ')] d[b'parents'] = [bin(h) for h in d[b'parents'].split(b' ')]
d[b'nodestoremove'] = [ d[b'nodestoremove'] = [
bin(h) for h in d[b'nodestoremove'].split(b' ') bin(h) for h in d[b'nodestoremove'].split(b' ')
] ]
except (ValueError, TypeError, KeyError) as err: except (ValueError, TypeError, KeyError) as err:
raise error.CorruptedState(pycompat.bytestr(err)) raise error.CorruptedState(stringutil.forcebytestr(err))
@classmethod @classmethod
def _getversion(cls, repo): def _getversion(cls, repo):
"""Read version information from shelvestate file""" """Read version information from shelvestate file"""
fp = repo.vfs(cls._filename) fp = repo.vfs(cls._filename)
try: try:
version = int(fp.readline().strip()) version = int(fp.readline().strip())
except ValueError as err: except ValueError as err:
raise error.CorruptedState(pycompat.bytestr(err)) raise error.CorruptedState(stringutil.forcebytestr(err))
finally: finally:
fp.close() fp.close()
return version return version
@classmethod @classmethod
def _readold(cls, repo): def _readold(cls, repo):
"""Read the old position-based version of a shelvestate file""" """Read the old position-based version of a shelvestate file"""
# Order is important, because old shelvestate file uses it # Order is important, because old shelvestate file uses it