Fix mocker.spy on Python 2 for non-functions

Fix #157

Author: nicoddemus

CHANGELOG.rst

@@ -1,3 +1,13 @@
+1.11.1
+------
+
+* Fix ``mocker.spy`` on Python 2 when used on non-function objects
+  which implement ``__call__`` (`#157`_). Thanks `@pbasista`_  for
+  the report.
+
+.. _#157: https://github.com/pytest-dev/pytest-mock/issues/157
+.. _@pbasista: https://github.com/pbasista
+
 1.11.0
 ------
 

pytest_mock.py

@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
+import functools
 import inspect
 import sys
-from functools import wraps
 
 import pytest
 
@@ -105,7 +105,13 @@ def spy(self, obj, name):
                 if isinstance(value, (classmethod, staticmethod)):
                     autospec = False
 
-        @wraps(method)
+        if sys.version_info[0] == 2:
+            assigned = [x for x in functools.WRAPPER_ASSIGNMENTS if hasattr(method, x)]
+            w = functools.wraps(method, assigned=assigned)
+        else:
+            w = functools.wraps(method)
+
+        @w
         def wrapper(*args, **kwargs):
             r = method(*args, **kwargs)
             result.return_value = r

test_pytest_mock.py

@@ -366,6 +366,26 @@ class Foo(Base):
     assert spy.return_value == 20
 
 
+def test_callable_like_spy(testdir, mocker):
+    testdir.makepyfile(
+        uut="""
+        class CallLike(object):
+            def __call__(self, x):
+                return x * 2
+
+        call_like = CallLike()
+    """
+    )
+    testdir.syspathinsert()
+
+    import uut
+
+    spy = mocker.spy(uut, "call_like")
+    uut.call_like(10)
+    spy.assert_called_once_with(10)
+    assert spy.return_value == 20
+
+
 @contextmanager
 def assert_traceback():
     """