changeset 36585 | 26a6b62919e2 |
parent 36584 | f5427483eebe |
child 36588 | 281f66777ff0 |
--- a/mercurial/util.py Fri Mar 02 14:09:20 2018 -0500 +++ b/mercurial/util.py Fri Mar 02 14:09:50 2018 -0500 @@ -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)