Fixes inspect and attribute error issues.

python · lisroach · May 20, 2019 · May 14, 2018 · Jul 22, 2018 · Aug 16, 2018
commit 96ddb0e32945f835f01a16f6969d533ea9952b77
diff --git a/Lib/inspect.py b/Lib/inspect.py
@@ -182,11 +182,8 @@ def iscoroutinefunction(object):
 
     Coroutine functions are defined with "async def" syntax.
     """
-    try:
-        return bool((isfunction(object) or ismethod(object)) and
-                    object.__code__.co_flags & CO_COROUTINE)
-    except AttributeError:
-        pass
+    return bool((isfunction(object) or ismethod(object)) and
+                object.__code__.co_flags & CO_COROUTINE)
 
 
 def isasyncgenfunction(object):

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
@@ -52,7 +52,10 @@
 
 
 def _is_coroutine_obj(obj):
-    return asyncio.iscoroutinefunction(obj) or asyncio.iscoroutine(obj)
+    if getattr(obj, '__code__', None):
+        return asyncio.iscoroutinefunction(obj) or asyncio.iscoroutine(obj)
+    else:
+        return False
 
 
 def _is_instance_mock(obj):
@@ -461,7 +464,7 @@ def _mock_add_spec(self, spec, spec_set, _spec_as_instance=False,
         _spec_coroutines = []
 
         for attr in dir(spec):
-            if asyncio.iscoroutinefunction(getattr(spec, attr)):
+            if asyncio.iscoroutinefunction(getattr(spec, attr, None)):
                 _spec_coroutines.append(attr)
 
         if spec is not None and not _is_list(spec):
@@ -1054,7 +1057,10 @@ def __init__(self, spec=None, side_effect=None, return_value=DEFAULT,
                  wraps=None, name=None, spec_set=None, parent=None,
                  _spec_state=None, _new_name='', _new_parent=None, **kwargs):
         self.__dict__['_mock_return_value'] = return_value
-
+        # Makes inspect.iscoroutinefunction() return False when testing a Mock.
+        code_mock = NonCallableMock(spec_set=CodeType)
+        code_mock.co_flags = 0
+        self.__dict__['__code__'] = code_mock
         _safe_super(CallableMixin, self).__init__(
             spec, wraps, name, spec_set, parent,
             _spec_state, _new_name, _new_parent, **kwargs
@@ -2107,9 +2113,10 @@ def __init__(self, *args, **kwargs):
         self.__dict__['_mock_await_args'] = None
         self.__dict__['_mock_await_args_list'] = _CallList()
         code_mock = NonCallableMock(spec_set=CodeType)
-        code_mock.co_flags = 0
+        code_mock.co_flags = 129
         self.__dict__['__code__'] = code_mock
 
+
     def _mock_call(_mock_self, *args, **kwargs):
         try:
             result = super()._mock_call(*args, **kwargs)
@@ -2530,7 +2537,10 @@ def create_autospec(spec, spec_set=False, instance=False, _parent=None,
         spec = type(spec)
 
     is_type = isinstance(spec, type)
-    is_coroutine_func = asyncio.iscoroutinefunction(spec)
+    if getattr(spec, '__code__', None):
+        is_coroutine_func = asyncio.iscoroutinefunction(spec)
+    else:
+        is_coroutine_func = False
     _kwargs = {'spec': spec}
     if spec_set:
         _kwargs = {'spec_set': spec}

diff --git a/Lib/unittest/test/testmock/testasync.py b/Lib/unittest/test/testmock/testasync.py
@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import unittest
 
 from unittest.mock import call, CoroutineMock, patch, MagicMock
@@ -115,10 +116,16 @@ def test_async_decorator():
 
 
 class CoroutineMockTest(unittest.TestCase):
-    def test_iscoroutinefunction(self):
+    def test_iscoroutinefunction_default(self):
         mock = CoroutineMock()
         self.assertTrue(asyncio.iscoroutinefunction(mock))
 
+    def test_iscoroutinefunction_function(self):
+        async def foo(): pass
+        mock = CoroutineMock(foo)
+        self.assertTrue(asyncio.iscoroutinefunction(mock))
+        self.assertTrue(inspect.iscoroutinefunction(mock))
+
     def test_iscoroutine(self):
         mock = CoroutineMock()
         self.assertTrue(asyncio.iscoroutine(mock()))
@@ -178,6 +185,7 @@ def test_target_coroutine_spec_not(self):
         @patch.object(AsyncFoo, 'coroutine_method', spec=NormalFoo.a)
         def test_async_attribute(mock_method):
             self.assertTrue(isinstance(mock_method, MagicMock))
+            self.assertFalse(inspect.iscoroutinefunction(mock_method))
 
         test_async_attribute()
 

diff --git a/Lib/unittest/test/testmock/testcallable.py b/Lib/unittest/test/testmock/testcallable.py
@@ -2,6 +2,7 @@
 # E-mail: fuzzyman AT voidspace DOT org DOT uk
 # http://www.voidspace.org.uk/python/mock/
 
+import inspect
 import unittest
 from unittest.test.testmock.support import is_instance, X, SomeClass
 
@@ -146,6 +147,12 @@ def test_create_autospec_instance(self):
 
         self.assertRaises(TypeError, mock.wibble, 'some',  'args')
 
+    def test_inspect_iscoroutine_function(self):
+        def foo(): pass
+
+        mock = Mock(foo)
+        self.assertFalse(inspect.iscoroutine(mock))
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Lib/unittest/test/testmock/testhelpers.py b/Lib/unittest/test/testmock/testhelpers.py
@@ -698,7 +698,6 @@ class RaiserClass(object):
             @staticmethod
             def existing(a, b):
                 return a + b
-
         s = create_autospec(RaiserClass)
         self.assertRaises(TypeError, lambda x: s.existing(1, 2, 3))
         s.existing(1, 2)