[Python-checkins] cpython (3.3): don't shadow the __qualname__ descriptor with __qualname__ in the class's
benjamin.peterson
python-checkins at python.org
Wed Oct 31 05:08:13 CET 2012
http://hg.python.org/cpython/rev/1d700e1aff33
changeset: 80077:1d700e1aff33
branch: 3.3
parent: 80073:9371bf2287c4
user: Benjamin Peterson <benjamin at python.org>
date: Tue Oct 30 23:51:03 2012 -0400
summary:
don't shadow the __qualname__ descriptor with __qualname__ in the class's __dict__ (closes #16271)
files:
Lib/test/test_descr.py | 8 ++++----
Misc/NEWS | 3 +++
Objects/typeobject.c | 9 ++++-----
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4506,7 +4506,7 @@
ns = {'__qualname__': 'some.name'}
tp = type('Foo', (), ns)
self.assertEqual(tp.__qualname__, 'some.name')
- self.assertEqual(tp.__dict__['__qualname__'], 'some.name')
+ self.assertNotIn('__qualname__', tp.__dict__)
self.assertEqual(ns, {'__qualname__': 'some.name'})
ns = {'__qualname__': 1}
@@ -4564,7 +4564,7 @@
keys = list(it)
keys.sort()
self.assertEqual(keys, ['__dict__', '__doc__', '__module__',
- '__qualname__', '__weakref__', 'meth'])
+ '__weakref__', 'meth'])
@unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
'trace function introduces __local__')
@@ -4573,7 +4573,7 @@
it = self.C.__dict__.values()
self.assertNotIsInstance(it, list)
values = list(it)
- self.assertEqual(len(values), 6)
+ self.assertEqual(len(values), 5)
@unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
'trace function introduces __local__')
@@ -4584,7 +4584,7 @@
keys = [item[0] for item in it]
keys.sort()
self.assertEqual(keys, ['__dict__', '__doc__', '__module__',
- '__qualname__', '__weakref__', 'meth'])
+ '__weakref__', 'meth'])
def test_dict_type_with_metaclass(self):
# Testing type of __dict__ when metaclass set...
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
Core and Builtins
-----------------
+- Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a
+ class's __dict__ and on type.
+
- Issue #16197: Update winreg docstrings and documentation to match code.
Patch by Zachary Ware.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2250,11 +2250,10 @@
goto error;
}
}
- else {
- qualname = et->ht_name;
- }
- Py_INCREF(qualname);
- et->ht_qualname = qualname;
+ et->ht_qualname = qualname ? qualname : et->ht_name;
+ Py_INCREF(et->ht_qualname);
+ if (qualname != NULL && PyDict_DelItem(dict, PyId___qualname__.object) < 0)
+ goto error;
/* Set tp_doc to a copy of dict['__doc__'], if the latter is there
and is a string. The __doc__ accessor will first look for tp_doc;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list