Merged revisions 77161 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77161 | benjamin.peterson | 2009-12-30 13:44:54 -0600 (Wed, 30 Dec 2009) | 12 lines
Merged revisions 77157 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77157 | benjamin.peterson | 2009-12-30 13:34:10 -0600 (Wed, 30 Dec 2009) | 5 lines
check if the attribute is set before deleting it with T_OBJECT_EX (fixes #7604)
Also, add a note to the docs about the better behavior of T_OBJECT_EX as
compared to T_OBJECT.
........
................
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 17d96b2..a02fe39 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1044,6 +1044,11 @@
del h
self.assertEqual(s.getvalue(), '')
+ class X(object):
+ __slots__ = "a"
+ with self.assertRaises(AttributeError):
+ del X().a
+
def test_slots_special(self):
# Testing __dict__ and __weakref__ in __slots__...
class D(object):