Merge pull request #92 from nicoddemus/release-1.6.3

Release 1.6.3

Author: nicoddemus

.travis.yml

@@ -25,10 +25,10 @@ deploy:
   provider: pypi
   user: nicoddemus
   skip_upload_docs: true
+  distributions: sdist bdist_wheel
   password:
     secure: OEWrbk09CZRrwFE6sBpRqQHu45zRu1S0Ly1ZeprkFCKxMd9tZOnrYM5qxCDQXxFHIvuyajuJ+qWTOgxUvurQMNsD6DbvJKTJ0R8upH1b1Q95KK8xiJFedhqBEUga5GrInK59oo0Sgblse2jtH5NnHXRUClSdT+iHdLY5sljCTRg=
   on:
     tags: true
-    distributions: sdist bdist_wheel
     repo: pytest-dev/pytest-mock
     condition: $TRAVIS_PYTHON_VERSION = 3.6

CHANGELOG.rst

@@ -1,3 +1,14 @@
+1.6.3
+-----
+
+* Fix ``UnicodeDecodeError`` during assert introspection in ``assert_called_with`` in Python 2.
+  Thanks `@AndreasHogstrom`_ for the report (`#91`_).
+
+
+.. _@AndreasHogstrom: https://github.com/AndreasHogstrom
+
+.. _#91: https://github.com/pytest-dev/pytest-mock/issues/91
+
 1.6.2
 -----
 

pytest_mock.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import inspect
 import sys
 
@@ -7,6 +9,12 @@
 
 __version__ = version
 
+# pseudo-six; if this starts to require more than this, depend on six already
+if sys.version_info[0] == 2:  # pragma: no cover
+    text_type = unicode  # noqa
+else:
+    text_type = str
+
 
 def _get_mock_module(config):
     """
@@ -179,21 +187,21 @@ def assert_wrapper(__wrapped_mock_method__, *args, **kwargs):
         return
     except AssertionError as e:
         if getattr(e, '_mock_introspection_applied', 0):
-            msg = str(e)
+            msg = text_type(e)
         else:
             __mock_self = args[0]
-            msg = str(e)
+            msg = text_type(e)
             if __mock_self.call_args is not None:
                 actual_args, actual_kwargs = __mock_self.call_args
                 msg += '\n\npytest introspection follows:\n'
                 try:
                     assert actual_args == args[1:]
                 except AssertionError as e:
-                    msg += '\nArgs:\n' + str(e)
+                    msg += '\nArgs:\n' + text_type(e)
                 try:
                     assert actual_kwargs == kwargs
                 except AssertionError as e:
-                    msg += '\nKwargs:\n' + str(e)
+                    msg += '\nKwargs:\n' + text_type(e)
     e = AssertionError(msg)
     e._mock_introspection_applied = True
     raise e

test_pytest_mock.py

@@ -534,3 +534,13 @@ def test(mocker):
         "*{'bar': 4}*",
         "*Use -v to get the full diff*",
     ])
+
+
+def test_assert_called_with_unicode_arguments(mocker):
+    """Test bug in assert_call_with called with non-ascii unicode string (#91)"""
+    stub = mocker.stub()
+    stub(b'l\xc3\xb6k'.decode('UTF-8'))
+
+    with pytest.raises(AssertionError):
+        stub.assert_called_with(u'lak')
+

tox.ini

@@ -13,7 +13,6 @@ commands =
     coverage run --append --source=pytest_mock.py -m pytest test_pytest_mock.py
 
 [testenv:linting]
-basepython = python3.5
 skip_install=True
 deps =
     pytest-flakes