[3.12] gh-65454: avoid triggering call to a PropertyMock in NonCallab…

…leMock.__setattr__ (GH-120019) (#120337) gh-65454: avoid triggering call to a PropertyMock in NonCallableMock.__setattr__ (GH-120019) (cherry picked from commit 9e9ee50) Co-authored-by: blhsing <[email protected]>
python · Jun 11, 2024 · f648192 · f648192
1 parent fa291a3
commit f648192
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/Lib/test/test_unittest/testmock/testhelpers.py b/Lib/test/test_unittest/testmock/testhelpers.py
@@ -1127,6 +1127,14 @@ def test_propertymock_side_effect(self):
         p.assert_called_once_with()
 
 
+    def test_propertymock_attach(self):
+        m = Mock()
+        p = PropertyMock()
+        type(m).foo = p
+        m.attach_mock(p, 'foo')
+        self.assertEqual(m.mock_calls, [])
+
+
 class TestCallablePredicate(unittest.TestCase):
 
     def test_type(self):

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
@@ -800,6 +800,9 @@ def __setattr__(self, name, value):
             mock_name = f'{self._extract_mock_name()}.{name}'
             raise AttributeError(f'Cannot set {mock_name}')
 
+        if isinstance(value, PropertyMock):
+            self.__dict__[name] = value
+            return
         return object.__setattr__(self, name, value)
 
 

diff --git a/Misc/NEWS.d/next/Library/2024-06-04-08-57-02.gh-issue-65454.o9j4wF.rst b/Misc/NEWS.d/next/Library/2024-06-04-08-57-02.gh-issue-65454.o9j4wF.rst
@@ -0,0 +1 @@
+:func:`unittest.mock.Mock.attach_mock` no longer triggers a call to a ``PropertyMock`` being attached.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		:func:`unittest.mock.Mock.attach_mock` no longer triggers a call to a ``PropertyMock`` being attached.