commit 9567112eb7af9e40f2d942ec73faa42b3182bf3f
author Benjamin Peterson <benjamin@python.org> Sun Dec 13 17:34:05 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Sun Dec 13 17:34:05 2009 +0000
tree e6b90b86a4eefd640f93ec6c298bbb6257239f40
parent d76e711eabd7b1d0ff96b4df2d8e7ba86be40abe

Merged revisions 76798-76799 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76798 | benjamin.peterson | 2009-12-13 11:29:16 -0600 (Sun, 13 Dec 2009) | 1 line

  make StringIO like other file objects in that readline(-1) has no effect #7348
........
  r76799 | benjamin.peterson | 2009-12-13 11:31:31 -0600 (Sun, 13 Dec 2009) | 1 line

  add NEWS note
........

Lib/StringIO.py

diff --git a/Lib/StringIO.py b/Lib/StringIO.py
index 232009f..300dd5a 100644
--- a/Lib/StringIO.py
+++ b/Lib/StringIO.py
@@ -158,7 +158,7 @@
             newpos = self.len
         else:
             newpos = i+1
-        if length is not None:
+        if length is not None and length > 0:
             if self.pos + length < newpos:
                 newpos = self.pos + length
         r = self.buf[self.pos:newpos]