diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-10-12 23:06:22 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-10-12 23:06:22 (GMT) |
| commit | 582162e42ba4c944fa96c15a99de29ea96ea9ca3 (patch) | |
| tree | cf2d9057a3ede1221810619875d1976ae36bcd02 /Objects | |
| parent | 93f5cd42e7a2cc99a7a9670e7d0ea7db2290fcf3 (diff) | |
| download | cpython-582162e42ba4c944fa96c15a99de29ea96ea9ca3.zip cpython-582162e42ba4c944fa96c15a99de29ea96ea9ca3.tar.gz cpython-582162e42ba4c944fa96c15a99de29ea96ea9ca3.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')
| -rw-r--r-- | Objects/moduleobject.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index def3781..5dd9c01 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -312,10 +312,7 @@ module_dealloc(PyModuleObject *m) if (m->md_def && m->md_def->m_free) m->md_def->m_free(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); } if (m->md_state != NULL) |