mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-35504: Fix a SystemError when delete the characters_written attribute of an OSError. (GH-11172)

Browse source
This commit is contained in:
Serhiy Storchaka 2018-12-17 16:43:14 +02:00 • committed by GitHub
parent fae95874b7
commit e2af34fcf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_exception_hierarchy.py
View file

@ -150,10 +150,15 @@ class AttributesTest(unittest.TestCase):
e = BlockingIOError(*args[:n]) e = BlockingIOError(*args[:n])
with self.assertRaises(AttributeError): with self.assertRaises(AttributeError):
e.characters_written e.characters_written
with self.assertRaises(AttributeError):
del e.characters_written
e = BlockingIOError("a", "b", 3) e = BlockingIOError("a", "b", 3)
self.assertEqual(e.characters_written, 3) self.assertEqual(e.characters_written, 3)
e.characters_written = 5 e.characters_written = 5
self.assertEqual(e.characters_written, 5) self.assertEqual(e.characters_written, 5)
del e.characters_written
with self.assertRaises(AttributeError):
e.characters_written
class ExplicitSubclassingTest(unittest.TestCase): class ExplicitSubclassingTest(unittest.TestCase):

1
Misc/NEWS.d/next/Core and Builtins/2018-12-15-00-47-41.bpo-35504.9gVuen.rst Normal file
View file

@ -0,0 +1 @@
Fixed a SystemError when delete the characters_written attribute of an OSError.

8
Objects/exceptions.c
View file

@ -1196,6 +1196,14 @@ OSError_written_get(PyOSErrorObject *self, void *context)
static int static int
OSError_written_set(PyOSErrorObject *self, PyObject *arg, void *context) OSError_written_set(PyOSErrorObject *self, PyObject *arg, void *context)
{ {
if (arg == NULL) {
if (self->written == -1) {
PyErr_SetString(PyExc_AttributeError, "characters_written");
return -1;
}
self->written = -1;
return 0;
}
Py_ssize_t n; Py_ssize_t n;
n = PyNumber_AsSsize_t(arg, PyExc_ValueError); n = PyNumber_AsSsize_t(arg, PyExc_ValueError);
if (n == -1 && PyErr_Occurred()) if (n == -1 && PyErr_Occurred())