record new upstream branch created by importing pytest-mock_1.2.orig.tar.gz and merge it

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pytest-mock
-Version: 1.1
+Version: 1.2
 Summary: Thin-wrapper around the mock package for easier use with py.test
 Home-page: https://github.com/pytest-dev/pytest-mock/
 Author: Bruno Oliveira
@@ -77,6 +77,7 @@ Description: ===========
         * `PropertyMock <https://docs.python.org/3/library/unittest.mock.html#unittest.mock.PropertyMock>`_
         * `ANY <https://docs.python.org/3/library/unittest.mock.html#any>`_
         * `call <https://docs.python.org/3/library/unittest.mock.html#call>`_ *(Version 1.1)*
+        * `sentinel <https://docs.python.org/3/library/unittest.mock.html#sentinel>`_ *(Version 1.2)*
         
         
         Spy

README.rst

@@ -69,6 +69,7 @@ Some objects from the ``mock`` module are accessible directly from ``mocker`` fo
 * `PropertyMock <https://docs.python.org/3/library/unittest.mock.html#unittest.mock.PropertyMock>`_
 * `ANY <https://docs.python.org/3/library/unittest.mock.html#any>`_
 * `call <https://docs.python.org/3/library/unittest.mock.html#call>`_ *(Version 1.1)*
+* `sentinel <https://docs.python.org/3/library/unittest.mock.html#sentinel>`_ *(Version 1.2)*
 
 
 Spy

debian/.git-dpm

@@ -1,11 +1,11 @@
 # see git-dpm(1) from git-dpm package
-4c5a29cf296e517d1c6aef496076acb43139ed1f
-4c5a29cf296e517d1c6aef496076acb43139ed1f
-4c5a29cf296e517d1c6aef496076acb43139ed1f
-4c5a29cf296e517d1c6aef496076acb43139ed1f
-pytest-mock_1.1.orig.tar.gz
-4bf436190a887b2084bf9553b9fd921efc47d1c9
-11286
+bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
+bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
+bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
+bdae00c258a6eb42dcd6e1f0dd4ddfc3be17723c
+pytest-mock_1.2.orig.tar.gz
+179568a82c1107fbfbd799e2887c17ee59dec834
+11527
 debianTag="debian/%e%v"
 patchedTag="patched/%e%v"
 upstreamTag="upstream/%e%u"

pytest_mock.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pytest-mock
-Version: 1.1
+Version: 1.2
 Summary: Thin-wrapper around the mock package for easier use with py.test
 Home-page: https://github.com/pytest-dev/pytest-mock/
 Author: Bruno Oliveira
@@ -77,6 +77,7 @@ Description: ===========
         * `PropertyMock <https://docs.python.org/3/library/unittest.mock.html#unittest.mock.PropertyMock>`_
         * `ANY <https://docs.python.org/3/library/unittest.mock.html#any>`_
         * `call <https://docs.python.org/3/library/unittest.mock.html#call>`_ *(Version 1.1)*
+        * `sentinel <https://docs.python.org/3/library/unittest.mock.html#sentinel>`_ *(Version 1.2)*
         
         
         Spy

pytest_mock.py

@@ -1,14 +1,13 @@
 import inspect
-import sys
 
 import pytest
 
-if sys.version_info >= (3, 3): # pragma: no cover
-    import unittest.mock as mock_module
-else:
+try:
     import mock as mock_module
+except ImportError:
+    import unittest.mock as mock_module
 
-version = '1.1'
+version = '1.2'
 
 
 class MockFixture(object):
@@ -22,6 +21,7 @@ class MockFixture(object):
     PropertyMock = mock_module.PropertyMock
     call = mock_module.call
     ANY = mock_module.ANY
+    sentinel = mock_module.sentinel
 
     def __init__(self):
         self._patches = []  # list of mock._patch objects

test_pytest_mock.py

@@ -132,7 +132,7 @@ def test_deprecated_mock(mock, tmpdir):
     assert os.listdir(str(tmpdir)) == []
 
 
-@pytest.mark.parametrize('name', ['MagicMock', 'PropertyMock', 'Mock', 'call', 'ANY'])
+@pytest.mark.parametrize('name', ['MagicMock', 'PropertyMock', 'Mock', 'call', 'ANY', 'sentinel'])
 def test_mocker_aliases(name):
     from pytest_mock import mock_module, MockFixture
 
@@ -455,7 +455,7 @@ def test_monkeypatch_ini(mocker, testdir):
     assert result.ret == 0
 
 
-def test_parse_ini_boolean(testdir):
+def test_parse_ini_boolean():
     import pytest_mock
     assert pytest_mock.parse_ini_boolean('True') is True
     assert pytest_mock.parse_ini_boolean('false') is False