[Python-checkins] cpython (merge 3.2 -> default): Raise ValueError when attempting to set the _CHUNK_SIZE attribute of a
antoine.pitrou
python-checkins at python.org
Wed Jul 13 21:10:06 CEST 2011
http://hg.python.org/cpython/rev/9648b63af5fa
changeset: 71310:9648b63af5fa
parent: 71308:0a5352cb19df
parent: 71309:2b97f5220940
user: Antoine Pitrou <solipsis at pitrou.net>
date: Wed Jul 13 21:08:56 2011 +0200
summary:
Raise ValueError when attempting to set the _CHUNK_SIZE attribute of a TextIOWrapper to a huge value, not TypeError.
files:
Misc/NEWS | 3 +++
Modules/_io/textio.c | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -225,6 +225,9 @@
Library
-------
+- Raise ValueError when attempting to set the _CHUNK_SIZE attribute of a
+ TextIOWrapper to a huge value, not TypeError.
+
- Issue #12504: Close file handles in a timely manner in packaging.database.
This fixes a bug with the remove (uninstall) feature on Windows.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -2618,7 +2618,7 @@
{
Py_ssize_t n;
CHECK_INITIALIZED_INT(self);
- n = PyNumber_AsSsize_t(arg, PyExc_TypeError);
+ n = PyNumber_AsSsize_t(arg, PyExc_ValueError);
if (n == -1 && PyErr_Occurred())
return -1;
if (n <= 0) {
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list