This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12337

worker: silence type error when calling pickle
ClosedPublic

Authored by indygreg on Mar 3 2022, 8:39 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGa0674e916fb6: worker: silence type error when calling pickle
Summary

pytype is complaining that the argument to pickle.load() is not an
IO. pytype isn't wrong: _blockingreader doesn't implement
io.RawIOBase, only read() and readline(). But it appears this is
enough for pickle. So we silence the false positive.

This fixes a regression introduced by D12304 /
cc0e059d2af8: worker: remove Python 2 support code.

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

indygreg created this revision.Mar 3 2022, 8:39 PM
Alphare accepted this revision.Mar 4 2022, 7:15 AM
Alphare added a subscriber: Alphare.

Thanks

This revision is now accepted and ready to land.Mar 4 2022, 7:15 AM
indygreg added a commit: rHGa0674e916fb6: worker: silence type error when calling pickle.Mar 4 2022, 7:25 AM
Closed by commit rHGa0674e916fb6: worker: silence type error when calling pickle (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/worker.py (4 lines)

Diff 32566

mercurial/worker.py

selector.close() selector.close()
return problem[0] return problem[0]
try: try:
openpipes = len(pipes) openpipes = len(pipes)
while openpipes > 0: while openpipes > 0:
for key, events in selector.select(): for key, events in selector.select():
try: try:
# The pytype error likely goes away on a modern version of
# pytype having a modern typeshed snapshot.
# pytype: disable=wrong-arg-types
res = pickle.load(_blockingreader(key.fileobj)) res = pickle.load(_blockingreader(key.fileobj))
# pytype: enable=wrong-arg-types
if hasretval and res[0]: if hasretval and res[0]:
retval.update(res[1]) retval.update(res[1])
else: else:
yield res yield res
except EOFError: except EOFError:
selector.unregister(key.fileobj) selector.unregister(key.fileobj)
key.fileobj.close() key.fileobj.close()
openpipes -= 1 openpipes -= 1