summaryrefslogtreecommitdiff
path: root/mock/tests/testcallable.py
diff options
context:
space:
mode:
Diffstat (limited to 'mock/tests/testcallable.py')
-rw-r--r--mock/tests/testcallable.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/mock/tests/testcallable.py b/mock/tests/testcallable.py
index 729947e..41715ed 100644
--- a/mock/tests/testcallable.py
+++ b/mock/tests/testcallable.py
@@ -8,9 +8,8 @@ from mock.tests.support import is_instance, X, SomeClass
from mock import (
Mock, MagicMock, NonCallableMagicMock,
NonCallableMock, patch, create_autospec,
- CallableMixin
)
-
+from mock.mock import CallableMixin
class TestCallable(unittest.TestCase):
@@ -106,14 +105,8 @@ class TestCallable(unittest.TestCase):
class Multi(SomeClass, Sub):
pass
- class OldStyle:
- def __call__(self): pass
-
- class OldStyleSub(OldStyle):
- pass
-
for arg in 'spec', 'spec_set':
- for Klass in CallableX, Sub, Multi, OldStyle, OldStyleSub:
+ for Klass in CallableX, Sub, Multi:
with patch('%s.X' % __name__, **{arg: Klass}) as mock:
instance = mock()
mock.assert_called_once_with()