Commit 0c408964 authored by Vincent Pelletier's avatar Vincent Pelletier

fixup! Apply a workaround for inspect.getmembers recent behaviour change.

parent ba45542e
...@@ -539,6 +539,7 @@ def _fixMockForInspect(): ...@@ -539,6 +539,7 @@ def _fixMockForInspect():
def f(self): def f(self):
pass pass
if not inspect.getmembers(A, inspect.ismethod): if not inspect.getmembers(A, inspect.ismethod):
from mock import Mock, MockCallable
# _setupSubclassMethodInterceptors is under the FreeBSD license. # _setupSubclassMethodInterceptors is under the FreeBSD license.
# See pyMock module for the whole license. # See pyMock module for the whole license.
def _setupSubclassMethodInterceptors(self): def _setupSubclassMethodInterceptors(self):
...@@ -549,6 +550,5 @@ def _fixMockForInspect(): ...@@ -549,6 +550,5 @@ def _fixMockForInspect():
# Don't record calls to methods of Mock base class. # Don't record calls to methods of Mock base class.
if not name in baseMethods: if not name in baseMethods:
self.__dict__[name] = MockCallable(name, self, handcrafted=True) self.__dict__[name] = MockCallable(name, self, handcrafted=True)
from mock import Mock
Mock._setupSubclassMethodInterceptors = _setupSubclassMethodInterceptors Mock._setupSubclassMethodInterceptors = _setupSubclassMethodInterceptors
_fixMockForInspect() _fixMockForInspect()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment