mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 08:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #7249: Methods of io.BytesIO now allow long as well as int arguments.

Browse source 
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)
........
This commit is contained in:
Antoine Pitrou 2009-11-02 21:03:53 +00:00
parent b29642f129
commit f226ac8a72
3 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_memoryio.py
View file

@ -80,6 +80,9 @@ class MemoryTestMixin:
self.assertEqual(memio.getvalue(), buf[:6]) self.assertEqual(memio.getvalue(), buf[:6])
self.assertEqual(memio.truncate(4), 4) self.assertEqual(memio.truncate(4), 4)
self.assertEqual(memio.getvalue(), buf[: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) self.assertEqual(memio.tell(), 4)
memio.write(buf) memio.write(buf)
self.assertEqual(memio.getvalue(), buf[:4] + 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(0), self.EOF)
self.assertEqual(memio.read(1), buf[:1]) 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(900), buf[5:])
self.assertEqual(memio.read(), self.EOF) self.assertEqual(memio.read(), self.EOF)
memio.seek(0) memio.seek(0)
@ -136,7 +140,8 @@ class MemoryTestMixin:
self.assertEqual(memio.readline(), self.EOF) self.assertEqual(memio.readline(), self.EOF)
memio.seek(0) memio.seek(0)
self.assertEqual(memio.readline(5), buf[:5]) 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]) self.assertEqual(memio.readline(5), buf[10:15])
memio.seek(0) memio.seek(0)
self.assertEqual(memio.readline(-1), buf) self.assertEqual(memio.readline(-1), buf)
@ -164,7 +169,8 @@ class MemoryTestMixin:
memio.seek(5) memio.seek(5)
self.assertEqual(memio.readlines(), [buf[5:]] + [buf] * 9) self.assertEqual(memio.readlines(), [buf[5:]] + [buf] * 9)
memio.seek(0) memio.seek(0)
self.assertEqual(memio.readlines(15), [buf] * 2) # readlines() accepts long objects
self.assertEqual(memio.readlines(15L), [buf] * 2)
memio.seek(0) memio.seek(0)
self.assertEqual(memio.readlines(-1), [buf] * 10) self.assertEqual(memio.readlines(-1), [buf] * 10)
memio.seek(0) memio.seek(0)
@ -225,6 +231,8 @@ class MemoryTestMixin:
self.assertEqual(memio.seek(0, 0), 0) self.assertEqual(memio.seek(0, 0), 0)
self.assertEqual(memio.read(), buf) self.assertEqual(memio.read(), buf)
self.assertEqual(memio.seek(3), 3) 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.seek(0, 1), 3)
self.assertEqual(memio.read(), buf[3:]) self.assertEqual(memio.read(), buf[3:])
self.assertEqual(memio.seek(len(buf)), len(buf)) self.assertEqual(memio.seek(len(buf)), len(buf))

3
Misc/NEWS
View file

@ -24,6 +24,9 @@ Core and Builtins
Library Library
------- -------
- Issue #7249: Methods of io.BytesIO now allow `long` as well as `int`
arguments.
- Issue #6665: Fix fnmatch to properly match filenames with newlines in them. - Issue #6665: Fix fnmatch to properly match filenames with newlines in them.
- Issue #1008086: Fixed socket.inet_aton() to always return 4 bytes even on - Issue #1008086: Fixed socket.inet_aton() to always return 4 bytes even on

16
Modules/_bytesio.c
View file

@ -219,8 +219,8 @@ bytesio_read(BytesIOObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|O:read", &arg)) if (!PyArg_ParseTuple(args, "|O:read", &arg))
return NULL; return NULL;
if (PyInt_Check(arg)) { if (PyIndex_Check(arg)) {
size = PyInt_AsSsize_t(arg); size = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
if (size == -1 && PyErr_Occurred()) if (size == -1 && PyErr_Occurred())
return NULL; return NULL;
} }
@ -288,8 +288,8 @@ bytesio_readline(BytesIOObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|O:readline", &arg)) if (!PyArg_ParseTuple(args, "|O:readline", &arg))
return NULL; return NULL;
if (PyInt_Check(arg)) { if (PyIndex_Check(arg)) {
size = PyInt_AsSsize_t(arg); size = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
if (size == -1 && PyErr_Occurred()) if (size == -1 && PyErr_Occurred())
return NULL; return NULL;
} }
@ -334,8 +334,8 @@ bytesio_readlines(BytesIOObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|O:readlines", &arg)) if (!PyArg_ParseTuple(args, "|O:readlines", &arg))
return NULL; return NULL;
if (PyInt_Check(arg)) { if (PyIndex_Check(arg)) {
maxsize = PyInt_AsSsize_t(arg); maxsize = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
if (maxsize == -1 && PyErr_Occurred()) if (maxsize == -1 && PyErr_Occurred())
return NULL; return NULL;
} }
@ -419,8 +419,8 @@ bytesio_truncate(BytesIOObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|O:truncate", &arg)) if (!PyArg_ParseTuple(args, "|O:truncate", &arg))
return NULL; return NULL;
if (PyInt_Check(arg)) { if (PyIndex_Check(arg)) {
size = PyInt_AsSsize_t(arg); size = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
if (size == -1 && PyErr_Occurred()) if (size == -1 && PyErr_Occurred())
return NULL; return NULL;
} }