xiaolanpython
diff --git a/‎Lib/test/test_module.py‎
Lines changed: 8 additions & 0 deletions b/‎Lib/test/test_module.py‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎Misc/NEWS‎
Lines changed: 3 additions & 0 deletions b/‎Misc/NEWS‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎Objects/moduleobject.c‎
Lines changed: 4 additions & 1 deletion b/‎Objects/moduleobject.c‎
Lines changed: 4 additions & 1 deletion
@@ -55,6 +55,14 @@ def test_reinit(self):
               {"__name__": "foo", "__doc__": "foodoc", "bar": 42})
         self.assertTrue(foo.__dict__ is d)
 
+    def test_dont_clear_dict(self):
+        # See issue 7140.
+        def f():
+            foo = ModuleType("foo")
+            foo.bar = 4
+            return foo
+        self.assertEqual(f().__dict__["bar"], 4)
+
 def test_main():
     run_unittest(ModuleTests)
 
 
@@ -12,6 +12,9 @@ What's New in Python 2.7 alpha 1
 Core and Builtins
 -----------------
 
+- Issue #7140: The __dict__ of a module should not be cleared unless the module
+  is the only object holding a reference to it.
+
 - Issue #1754094: Improve the stack depth calculation in the compiler.
   There should be no other effect than a small decrease in memory use.
   Patch by Christopher Tur Lesniewski-Laas.
 
@@ -175,7 +175,10 @@ module_dealloc(PyModuleObject *m)
 {
 	PyObject_GC_UnTrack(m);
 	if (m->md_dict != NULL) {
-		_PyModule_Clear((PyObject *)m);
+		/* 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);
 		Py_DECREF(m->md_dict);
 	}
 	Py_TYPE(m)->tp_free((PyObject *)m);
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,10 @@ module_dealloc(PyModuleObject *m)`
`175`	`175`	`{`
`176`	`176`	`PyObject_GC_UnTrack(m);`
`177`	`177`	`if (m->md_dict != NULL) {`
`178`		`- _PyModule_Clear((PyObject *)m);`
	`178`	`+ /* If we are the only ones holding a reference, we can clear`
	`179`	`+ the dictionary. */`
	`180`	`+ if (Py_REFCNT(m->md_dict) == 1)`
	`181`	`+ _PyModule_Clear((PyObject *)m);`
`179`	`182`	`Py_DECREF(m->md_dict);`
`180`	`183`	`}`
`181`	`184`	`Py_TYPE(m)->tp_free((PyObject *)m);`