commit f3a9d722d77753f5110e35f46bd61732c0cb81c1
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Sat Apr 13 12:31:58 2019 -0700
committer GitHub <noreply@github.com> Sat Apr 13 12:31:58 2019 -0700
tree a4ee9bacbef96638c2e0fd9a9f3565512012de9e
parent d28aaa7df8bcd46f4135d240d041b0b171b664cc

bpo-36593: Fix isinstance check for Mock objects with spec executed under tracing (GH-12790)


In Python having a trace function in effect while mock is imported causes isinstance to be wrong for MagicMocks. This is due to the usage of super() in some class methods, as this sets the __class__ attribute. To avoid this, as a workaround, alias the usage of super .
(cherry picked from commit 830b43d03cc47a27a22a50d777f23c8e60820867)

Co-authored-by: Xtreak <tir.karthi@gmail.com>

Lib/unittest/mock.py

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 5b8e744..373e1d5 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -738,7 +738,7 @@
 
         obj = self._mock_children.get(name, _missing)
         if name in self.__dict__:
-            super().__delattr__(name)
+            _safe_super(NonCallableMock, self).__delattr__(name)
         elif obj is _deleted:
             raise AttributeError(name)
         if obj is not _missing: