summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-02 21:03:53 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-02 21:03:53 (GMT)
commitf226ac8a723ffc72f77209418f927b685bd7e281 (patch)
tree218ccf8172bb87438c74cc7776a1779089523160 /Lib/test
parentb29642f1297613f84c6678628b12a2bd5e3ae60a (diff)
downloadcpython-f226ac8a723ffc72f77209418f927b685bd7e281.zip
cpython-f226ac8a723ffc72f77209418f927b685bd7e281.tar.gz
cpython-f226ac8a723ffc72f77209418f927b685bd7e281.tar.bz2
Issue #7249: Methods of io.BytesIO now allow `long` as well as `int` arguments.
Merged revisions 76071 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76071 | antoine.pitrou | 2009-11-02 21:47:33 +0100 (lun., 02 nov. 2009) | 4 lines Add acceptance of long ints to test_memoryio.py (in preparation for fix of #7249 in 2.6) ........
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_memoryio.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
index 0b5ec9f..d538a7e 100644
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -80,6 +80,9 @@ class MemoryTestMixin:
self.assertEqual(memio.getvalue(), buf[:6])
self.assertEqual(memio.truncate(4), 4)
self.assertEqual(memio.getvalue(), buf[:4])
+ # truncate() accepts long objects
+ self.assertEqual(memio.truncate(4L), 4)
+ self.assertEqual(memio.getvalue(), buf[:4])
self.assertEqual(memio.tell(), 4)
memio.write(buf)
self.assertEqual(memio.getvalue(), buf[:4] + buf)
@@ -107,7 +110,8 @@ class MemoryTestMixin:
self.assertEqual(memio.read(0), self.EOF)
self.assertEqual(memio.read(1), buf[:1])
- self.assertEqual(memio.read(4), buf[1:5])
+ # read() accepts long objects
+ self.assertEqual(memio.read(4L), buf[1:5])
self.assertEqual(memio.read(900), buf[5:])
self.assertEqual(memio.read(), self.EOF)
memio.seek(0)
@@ -136,7 +140,8 @@ class MemoryTestMixin:
self.assertEqual(memio.readline(), self.EOF)
memio.seek(0)
self.assertEqual(memio.readline(5), buf[:5])
- self.assertEqual(memio.readline(5), buf[5:10])
+ # readline() accepts long objects
+ self.assertEqual(memio.readline(5L), buf[5:10])
self.assertEqual(memio.readline(5), buf[10:15])
memio.seek(0)
self.assertEqual(memio.readline(-1), buf)
@@ -164,7 +169,8 @@ class MemoryTestMixin:
memio.seek(5)
self.assertEqual(memio.readlines(), [buf[5:]] + [buf] * 9)
memio.seek(0)
- self.assertEqual(memio.readlines(15), [buf] * 2)
+ # readlines() accepts long objects
+ self.assertEqual(memio.readlines(15L), [buf] * 2)
memio.seek(0)
self.assertEqual(memio.readlines(-1), [buf] * 10)
memio.seek(0)
@@ -225,6 +231,8 @@ class MemoryTestMixin:
self.assertEqual(memio.seek(0, 0), 0)
self.assertEqual(memio.read(), buf)
self.assertEqual(memio.seek(3), 3)
+ # seek() accepts long objects
+ self.assertEqual(memio.seek(3L), 3)
self.assertEqual(memio.seek(0, 1), 3)
self.assertEqual(memio.read(), buf[3:])
self.assertEqual(memio.seek(len(buf)), len(buf))