This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5704

util: cast memoryview to bytes
ClosedPublic

Authored by indygreg on Jan 25 2019, 7:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb141b5243b37: util: cast memoryview to bytes
rHG435e8884fc2f: util: cast memoryview to bytes
Summary

Python 3 uses readinto() instead of read() in places. And
taking a slice of the buffer passed to readinto() will produce
a memoryview. _writedata() then gets confused when testing for
b'\n' in data because memoryview is an iterable over ints
instead of 1 character bytes.

We work around by casting a memoryview to bytes.

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.Jan 25 2019, 7:01 PM
Closed by commit rHG435e8884fc2f: util: cast memoryview to bytes (authored by indygreg). · Explain WhyJan 25 2019, 9:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (6 lines)

Diff 13482

mercurial/util.py

if not self.reads: if not self.reads:
return return
if self.logdataapis: if self.logdataapis:
self.fh.write('%s> readinto(%d) -> %r' % (self.name, len(dest), self.fh.write('%s> readinto(%d) -> %r' % (self.name, len(dest),
res)) res))
data = dest[0:res] if res is not None else b'' data = dest[0:res] if res is not None else b''
# _writedata() uses "in" operator and is confused by memoryview because
# characters are ints on Python 3.
if isinstance(data, memoryview):
data = data.tobytes()
self._writedata(data) self._writedata(data)
def write(self, res, data): def write(self, res, data):
if not self.writes: if not self.writes:
return return
# Python 2 returns None from some write() calls. Python 3 (reasonably) # Python 2 returns None from some write() calls. Python 3 (reasonably)
# returns the integer bytes written. # returns the integer bytes written.