This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10876

typing: suppress a false error in mercurial/revlogutils/docket.py on py2
ClosedPublic

Authored by mharbison72 on Jun 12 2021, 2:51 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbe903d043099: typing: suppress a false error in mercurial/revlogutils/docket.py on py2
Summary

ord() wants bytes or str on py3, so I'm guessing it got confused by passing a
single byte instead of a one byte string. But this seems to work on 2.7.18
anyway.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Jun 12 2021, 2:51 PM
pulkit accepted this revision.Jun 14 2021, 4:31 PM
This revision is now accepted and ready to land.Jun 14 2021, 4:31 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/docket.py (2 lines)

Diff 28559

mercurial/revlogutils/docket.py

seed = f.read().strip() seed = f.read().strip()
except IOError as inst: except IOError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
seed = b'04' # chosen by a fair dice roll. garanteed to be random seed = b'04' # chosen by a fair dice roll. garanteed to be random
if pycompat.ispy3: if pycompat.ispy3:
iter_seed = iter(seed) iter_seed = iter(seed)
else: else:
# pytype: disable=wrong-arg-types
iter_seed = (ord(c) for c in seed) iter_seed = (ord(c) for c in seed)
# pytype: enable=wrong-arg-types
# some basic circular sum hashing on 64 bits # some basic circular sum hashing on 64 bits
int_seed = 0 int_seed = 0
low_mask = int('1' * 35, 2) low_mask = int('1' * 35, 2)
for i in iter_seed: for i in iter_seed:
high_part = int_seed >> 35 high_part = int_seed >> 35
low_part = (int_seed & low_mask) << 28 low_part = (int_seed & low_mask) << 28
int_seed = high_part + low_part + i int_seed = high_part + low_part + i
r = random.Random() r = random.Random()