Patchwork D2561: util: work around Python 3 returning None at EOF instead of ''

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 8:26 p.m.
Message ID <8cb09e2a013531c168e223afa5e6d436@localhost.localdomain>
Download mbox | patch
Permalink /patch/28720/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 8:26 p.m.
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 &#039;&#039; (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




To: durin42, #hg-reviewers, yuja
Cc: mercurial-devel

Patch

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)