Commit e3569255 authored by Stefan Behnel's avatar Stefan Behnel

merge

parents d7d6fd3d a8cac59b
...@@ -115,7 +115,7 @@ class NormalisedNewlineStream(object): ...@@ -115,7 +115,7 @@ class NormalisedNewlineStream(object):
self.close = stream.close self.close = stream.close
self.encoding = getattr(stream, 'encoding', 'UTF-8') self.encoding = getattr(stream, 'encoding', 'UTF-8')
def read(self, count): def read(self, count=-1):
data = self._read(count) data = self._read(count)
if u'\r' not in data: if u'\r' not in data:
return data return data
......
__version__ = '0.13' __version__ = "0.13"
# Void cython.* directives (for case insensitive operating systems). # Void cython.* directives (for case insensitive operating systems).
from Cython.Shadow import * from Cython.Shadow import *
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment