D2561: util: work around Python 3 returning None at EOF instead of ''
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Fri Mar 2 15:26:13 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG26a6b62919e2: util: work around Python 3 returning None at EOF instead of '' (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2561?vs=6378&id=6384
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, yuja
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list