From de368717dad90577e4f491d3f4187742a7d00515 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Jan 2011 15:42:34 +0000
Subject: [PATCH] Merged revisions 87952-87954 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87952 | benjamin.peterson | 2011-01-12 09:24:27 -0600 (Wed, 12 Jan 2011) | 1 line
move this test to test_descr; it's not abc specific
........
r87953 | benjamin.peterson | 2011-01-12 09:25:02 -0600 (Wed, 12 Jan 2011) | 1 line
oops, wrong class
........
r87954 | benjamin.peterson | 2011-01-12 09:34:01 -0600 (Wed, 12 Jan 2011) | 1 line
don't segfault on deleting __abstractmethods__ #10892
........
---
Lib/test/test_abc.py | 7 -------
Lib/test/test_descr.py | 11 +++++++++++
Misc/NEWS | 3 +++
Objects/typeobject.c | 13 +++++++++++--
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
index 0fa40cb430..3aef4a00f2 100644
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -60,13 +60,6 @@ class TestABC(unittest.TestCase):
self.assertRaises(TypeError, F) # because bar is abstract now
self.assertTrue(isabstract(F))
- def test_type_has_no_abstractmethods(self):
- # type pretends not to have __abstractmethods__.
- self.assertRaises(AttributeError, getattr, type, "__abstractmethods__")
- class meta(type):
- pass
- self.assertRaises(AttributeError, getattr, meta, "__abstractmethods__")
-
def test_metaclass_abc(self):
# Metaclasses can be ABCs, too.
class A(metaclass=abc.ABCMeta):
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index e1c928f179..97a4e4b106 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4224,6 +4224,17 @@ order (MRO) for bases """
self.assertRaises(AttributeError, getattr, EvilGetattribute(), "attr")
+ def test_abstractmethods(self):
+ # type pretends not to have __abstractmethods__.
+ self.assertRaises(AttributeError, getattr, type, "__abstractmethods__")
+ class meta(type):
+ pass
+ self.assertRaises(AttributeError, getattr, meta, "__abstractmethods__")
+ class X(object):
+ pass
+ with self.assertRaises(AttributeError):
+ del X.__abstractmethods__
+
class DictProxyTests(unittest.TestCase):
def setUp(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 9157eae306..63883911d1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.1.4?
Core and Builtins
-----------------
+- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a
+ class.
+
- Issue #8020: Avoid a crash where the small objects allocator would read
non-Python managed memory while it is being modified by another thread.
Patch by Matt Bandy.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index c28d0363bd..6a325e823c 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -340,8 +340,17 @@ type_set_abstractmethods(PyTypeObject *type, PyObject *value, void *context)
abc.ABCMeta.__new__, so this function doesn't do anything
special to update subclasses.
*/
- int res = PyDict_SetItemString(type->tp_dict,
- "__abstractmethods__", value);
+ int res;
+ if (value != NULL) {
+ res = PyDict_SetItemString(type->tp_dict, "__abstractmethods__", value);
+ }
+ else {
+ res = PyDict_DelItemString(type->tp_dict, "__abstractmethods__");
+ if (res && PyErr_ExceptionMatches(PyExc_KeyError)) {
+ PyErr_Format(PyExc_AttributeError, "__abstractmethods__", value);
+ return -1;
+ }
+ }
if (res == 0) {
PyType_Modified(type);
if (value && PyObject_IsTrue(value)) {
--
2.40.0