Revert "Upgrade python/mock to 4.0.2" am: 3381fde741 am: 276f8d6022

Change-Id: I7de1ceedb047681f0ff4bf9d58c7d06112d3c0f3

1 files changed, 9 insertions, 2 deletions

diff --git a/mock/tests/testcallable.py b/mock/tests/testcallable.py
index 41715ed..729947e 100644
--- a/mock/tests/testcallable.py
+++ b/mock/tests/testcallable.py
@@ -8,8 +8,9 @@ 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):
@@ -105,8 +106,14 @@ 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:
+            for Klass in CallableX, Sub, Multi, OldStyle, OldStyleSub:
                 with patch('%s.X' % __name__, **{arg: Klass}) as mock:
                     instance = mock()
                     mock.assert_called_once_with()