merge patched into master

debian/.git-dpm

@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
-bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
+f13872e1a5118d1d13b2541988105376e9502527
+f13872e1a5118d1d13b2541988105376e9502527
 bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
 bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
 pytest-mock_1.2.orig.tar.gz

debian/patches/0001-Update-tests-to-work-with-pytest-3.patch

@@ -0,0 +1,31 @@
+From f13872e1a5118d1d13b2541988105376e9502527 Mon Sep 17 00:00:00 2001
+From: Vincent Bernat <vincent@bernat.im>
+Date: Sat, 15 Oct 2016 20:55:53 +0200
+Subject: Update tests to work with pytest 3
+
+---
+ test_pytest_mock.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test_pytest_mock.py b/test_pytest_mock.py
+index 1d55295fab4f..f293a3cfe21a 100644
+--- a/test_pytest_mock.py
++++ b/test_pytest_mock.py
+@@ -176,7 +176,7 @@ class TestMockerStub:
+         stub = mocker.stub(**kwargs)
+         with pytest.raises(AssertionError) as exc_info:
+             stub.assert_called_with()
+-        assert exc_info.value.msg == expected_message
++        assert str(exc_info.value) == expected_message
+ 
+     def test_failure_message_with_no_name(self, mocker):
+         self.__test_failure_message(mocker)
+@@ -352,7 +352,7 @@ def assert_argument_introspection(left, right):
+         #       test was run by examining sys.argv
+         verbose = any(a.startswith('-v') for a in sys.argv)
+         expected = '\n  '.join(util._compare_eq_iterable(left, right, verbose))
+-        assert expected in e.msg
++        assert expected in str(e)
+     else:
+         raise AssertionError("DID NOT RAISE")
+ 

debian/patches/series

@@ -0,0 +1 @@
+0001-Update-tests-to-work-with-pytest-3.patch

test_pytest_mock.py

@@ -176,7 +176,7 @@ class TestMockerStub:
         stub = mocker.stub(**kwargs)
         with pytest.raises(AssertionError) as exc_info:
             stub.assert_called_with()
-        assert exc_info.value.msg == expected_message
+        assert str(exc_info.value) == expected_message
 
     def test_failure_message_with_no_name(self, mocker):
         self.__test_failure_message(mocker)
@@ -352,7 +352,7 @@ def assert_argument_introspection(left, right):
         #       test was run by examining sys.argv
         verbose = any(a.startswith('-v') for a in sys.argv)
         expected = '\n  '.join(util._compare_eq_iterable(left, right, verbose))
-        assert expected in e.msg
+        assert expected in str(e)
     else:
         raise AssertionError("DID NOT RAISE")