mercurial/util.py
changeset 36585 26a6b62919e2
parent 36584 f5427483eebe
child 36588 281f66777ff0
equal deleted inserted replaced
36584:f5427483eebe 36585:26a6b62919e2
   727             self.fh.write('%s>     %s\n' % (self.name, escapedata(line)))
   727             self.fh.write('%s>     %s\n' % (self.name, escapedata(line)))
   728 
   728 
   729     def read(self, res, size=-1):
   729     def read(self, res, size=-1):
   730         if not self.reads:
   730         if not self.reads:
   731             return
   731             return
       
   732         # Python 3 can return None from reads at EOF instead of empty strings.
       
   733         if res is None:
       
   734             res = ''
   732 
   735 
   733         self.fh.write('%s> read(%d) -> %d' % (self.name, size, len(res)))
   736         self.fh.write('%s> read(%d) -> %d' % (self.name, size, len(res)))
   734         self._writedata(res)
   737         self._writedata(res)
   735 
   738 
   736     def readline(self, res, limit=-1):
   739     def readline(self, res, limit=-1):