D2561: util: work around Python 3 returning None at EOF instead of ''
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Fri Mar 2 20:04:33 UTC 2018
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2561
AFFECTED FILES
mercurial/util.py
CHANGE DETAILS
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -729,6 +729,9 @@
def read(self, res, size=-1):
if not self.reads:
return
+ # Python 3 can return None from reads at EOF instead of empty strings.
+ if res is None:
+ res = ''
self.fh.write('%s> read(%d) -> %d' % (self.name, size, len(res)))
self._writedata(res)
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list