summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Shepelev <temotor@gmail.com>2012-12-14 17:33:37 +0400
committerSergey Shepelev <temotor@gmail.com>2012-12-14 17:33:37 +0400
commit7aa8cbbfdcf6ead4e1bfc13a512b280d73f54da4 (patch)
treed4fcfa74d5f393458c98e82047b3780ebd440e93
parentf5fe024979a55b56faa38ff050686a52cf5958ec (diff)
downloadeventlet-7aa8cbbfdcf6ead4e1bfc13a512b280d73f54da4.tar.gz
greenio: relative seek() typo _get_readahead_len; Thanks to AlanP
https://bitbucket.org/which_linden/eventlet/issue/112
-rw-r--r--eventlet/greenio.py2
-rw-r--r--tests/greenio_test.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/eventlet/greenio.py b/eventlet/greenio.py
index 531bad1..339d1e6 100644
--- a/eventlet/greenio.py
+++ b/eventlet/greenio.py
@@ -473,7 +473,7 @@ class GreenPipe(_fileobject):
if whence == 1 and offset == 0: # tell synonym
return self.tell()
if whence == 1: # adjust offset by what is read ahead
- offset -= self.get_readahead_len()
+ offset -= self._get_readahead_len()
try:
rv = os.lseek(self.fileno(), offset, whence)
except OSError, e:
diff --git a/tests/greenio_test.py b/tests/greenio_test.py
index 3df5b5c..8955900 100644
--- a/tests/greenio_test.py
+++ b/tests/greenio_test.py
@@ -627,6 +627,8 @@ class TestGreenPipe(LimitedTestCase):
self.assertEquals(f.tell(), 2)
f.seek(0, 1)
self.assertEqual(f.readline(), '34567890')
+ f.seek(-5, 1)
+ self.assertEqual(f.readline(), '67890')
f.seek(0)
self.assertEqual(f.readline(), '1234567890')
f.seek(0, 2)