merge

e3569255 · Stefan Behnel · d7d6fd3d · a8cac59b · e3569255 · e3569255
Commit e3569255 authored Nov 03, 2010 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Cython/Utils.py Cython/Utils.py +1 -1

Cython/__init__.py Cython/__init__.py +1 -1

No files found.
--- a/Cython/Utils.py
+++ b/Cython/Utils.py
@@ -115,7 +115,7 @@ class NormalisedNewlineStream(object):
    self.close = stream.close
    self.encoding = getattr(stream, 'encoding', 'UTF-8')

-  def read(self, count):
+  def read(self, count=-1):
    data = self._read(count)
    if u'\r' not in data:
      return data

--- a/Cython/__init__.py
+++ b/Cython/__init__.py
-__version__ = '0.13'
+__version__ = "0.13"

 # Void cython.* directives (for case insensitive operating systems). 
 from Cython.Shadow import *