Merge branch 'main' of github.com:python/cpython into gh-102251

Author: sunmy2019

Lib/test/test_tkinter/__init__.py

@@ -1,18 +1,23 @@
 import os.path
 import unittest
-from test import support
-from test.support import import_helper
 
+from test.support import (
+    check_sanitizer,
+    import_helper,
+    load_package_tests,
+    requires,
+    )
 
-if support.check_sanitizer(address=True, memory=True):
+
+if check_sanitizer(address=True, memory=True):
     raise unittest.SkipTest("Tests involving libX11 can SEGFAULT on ASAN/MSAN builds")
 
 # Skip test if _tkinter wasn't built.
 import_helper.import_module('_tkinter')
 
 # Skip test if tk cannot be initialized.
-support.requires('gui')
+requires('gui')
 
 
 def load_tests(*args):
-    return support.load_package_tests(os.path.dirname(__file__), *args)
+    return load_package_tests(os.path.dirname(__file__), *args)

Lib/test/test_unittest/testmock/testmock.py

@@ -245,6 +245,14 @@ class B(object):
             with mock.patch('builtins.open', mock.mock_open()):
                 mock.mock_open()  # should still be valid with open() mocked
 
+    def test_explicit_parent(self):
+        parent = Mock()
+        mock1 = Mock(parent=parent, return_value=None)
+        mock1(1, 2, 3)
+        mock2 = Mock(parent=parent, return_value=None)
+        mock2(4, 5, 6)
+
+        self.assertEqual(parent.mock_calls, [call(1, 2, 3), call(4, 5, 6)])
 
     def test_reset_mock(self):
         parent = Mock()

Modules/_testsinglephase.c

@@ -140,7 +140,9 @@ init_module(PyObject *module, module_state *state)
     if (initialized == NULL) {
         return -1;
     }
-    if (PyModule_AddObjectRef(module, "_module_initialized", initialized) != 0) {
+    int rc = PyModule_AddObjectRef(module, "_module_initialized", initialized);
+    Py_DECREF(initialized);
+    if (rc < 0) {
         return -1;
     }