summaryrefslogtreecommitdiffstats
path: root/Objects/moduleobject.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-10-12 23:02:35 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-10-12 23:02:35 (GMT)
commitdc9542435b92ce224c1a5878bd49ae21db228e5e (patch)
treeb79c9978096bbb089d3c32f99bf241d4b453099d /Objects/moduleobject.c
parentd2f6ae63cd546d84310324012740425772e83de7 (diff)
downloadcpython-dc9542435b92ce224c1a5878bd49ae21db228e5e.zip
cpython-dc9542435b92ce224c1a5878bd49ae21db228e5e.tar.gz
cpython-dc9542435b92ce224c1a5878bd49ae21db228e5e.tar.bz2
Merged revisions 85392 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85392 | benjamin.peterson | 2010-10-12 17:57:59 -0500 (Tue, 12 Oct 2010) | 1 line prefer clearing global objects to obscure module.__dict__ bugs #10068 ........
Diffstat (limited to 'Objects/moduleobject.c')
-rw-r--r--Objects/moduleobject.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index ced16eb..08e9740 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -175,10 +175,7 @@ module_dealloc(PyModuleObject *m)
{
PyObject_GC_UnTrack(m);
if (m->md_dict != NULL) {
- /* If we are the only ones holding a reference, we can clear
- the dictionary. */
- if (Py_REFCNT(m->md_dict) == 1)
- _PyModule_Clear((PyObject *)m);
+ _PyModule_Clear((PyObject *)m);
Py_DECREF(m->md_dict);
}
Py_TYPE(m)->tp_free((PyObject *)m);