Drop support for EOL Python 2.7 and 3.4 (#176)

Drop support for EOL Python 2.7 and 3.4

Author: nicoddemus

.github/workflows/main.yml

@@ -10,11 +10,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["2.7", "3.5", "3.6", "3.7", "3.8"]
+        python: ["3.5", "3.6", "3.7", "3.8"]
         os: [ubuntu-latest, windows-latest]
         include:
-          - python: "2.7"
-            tox_env: "py27"
           - python: "3.5"
             tox_env: "py35"
           - python: "3.6"

.pre-commit-config.yaml

@@ -1,13 +1,12 @@
 exclude: '^($|.*\.bin)'
 repos:
   - repo: https://github.com/ambv/black
-    rev: 18.6b4
+    rev: 19.10b0
     hooks:
       - id: black
         args: [--safe, --quiet]
-        language_version: python3.6
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v1.3.0
+    rev: v2.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

README.rst

@@ -149,7 +149,7 @@ entries from the ``mock`` module.
 
 It also adds introspection information on differing call arguments when
 calling the helper methods. This features catches `AssertionError` raised in
-the method, and uses py.test's own `advanced assertions`_ to return a better
+the method, and uses pytest's own `advanced assertions`_ to return a better
 diff::
 
 
@@ -235,9 +235,8 @@ function decorators for mocking unnecessary.
 Requirements
 ============
 
-* Python 2.7, Python 3.4+
+* Python Python 3.5+
 * pytest
-* mock (for Python 2)
 
 
 Install
@@ -349,7 +348,7 @@ Tests are run with ``tox``, you can run the baseline environments before submitt
 
 .. code-block:: console
 
-    $ tox -e py27,py36,linting
+    $ tox -e py38,linting
 
 Style checks and formatting are done automatically during commit courtesy of
 `pre-commit <https://pre-commit.com>`_.

setup.py

@@ -8,15 +8,15 @@
     packages=find_packages(where="src"),
     package_dir={"": "src"},
     platforms="any",
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
-    install_requires=["pytest>=2.7", 'mock;python_version<"3.0"'],
+    python_requires=">=3.5",
+    install_requires=["pytest>=2.7"],
     use_scm_version={"write_to": "src/pytest_mock/_version.py"},
     setup_requires=["setuptools_scm"],
     url="https://github.com/pytest-dev/pytest-mock/",
     license="MIT",
     author="Bruno Oliveira",
     author_email="[email protected]",
-    description="Thin-wrapper around the mock package for easier use with py.test",
+    description="Thin-wrapper around the mock package for easier use with pytest",
     long_description=open("README.rst", encoding="utf-8").read(),
     keywords="pytest mock",
     extras_require={"dev": ["pre-commit", "tox"]},
@@ -26,14 +26,12 @@
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3 :: Only",
         "Topic :: Software Development :: Testing",
     ],
 )

src/pytest_mock/plugin.py

@@ -1,33 +1,24 @@
-from __future__ import unicode_literals
-
 import functools
 import inspect
-import sys
 
 import pytest
 
 from ._version import version
 
 __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):
     """
-    Import and return the actual "mock" module. By default this is "mock" for Python 2 and
-    "unittest.mock" for Python 3, but the user can force to always use "mock" on Python 3 using
+    Import and return the actual "mock" module. By default this is
+    "unittest.mock", but the user can force to always use "mock" using
     the mock_use_standalone_module ini option.
     """
     if not hasattr(_get_mock_module, "_module"):
         use_standalone_module = parse_ini_boolean(
             config.getini("mock_use_standalone_module")
         )
-        if sys.version_info[0] == 2 or use_standalone_module:
+        if use_standalone_module:
             import mock
 
             _get_mock_module._module = mock
@@ -39,7 +30,7 @@ def _get_mock_module(config):
     return _get_mock_module._module
 
 
-class MockFixture(object):
+class MockFixture:
     """
     Fixture that provides the same interface to functions in the mock module,
     ensuring that they are uninstalled at the end of each test.
@@ -105,13 +96,7 @@ def spy(self, obj, name):
                 if isinstance(value, (classmethod, staticmethod)):
                     autospec = False
 
-        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
+        @functools.wraps(method)
         def wrapper(*args, **kwargs):
             spy_obj.spy_return = None
             spy_obj.spy_exception = None
@@ -140,7 +125,7 @@ def stub(self, name=None):
         """
         return self.mock_module.MagicMock(spec=lambda *args, **kwargs: None, name=name)
 
-    class _Patcher(object):
+    class _Patcher:
         """
         Object to provide the same interface as mock.patch, mock.patch.object,
         etc. We need this indirection to keep the same API of the mock package.
@@ -219,21 +204,21 @@ def assert_wrapper(__wrapped_mock_method__, *args, **kwargs):
         return
     except AssertionError as e:
         if getattr(e, "_mock_introspection_applied", 0):
-            msg = text_type(e)
+            msg = str(e)
         else:
             __mock_self = args[0]
-            msg = text_type(e)
+            msg = str(e)
             if __mock_self.call_args is not None:
                 actual_args, actual_kwargs = __mock_self.call_args
                 introspection = ""
                 try:
                     assert actual_args == args[1:]
                 except AssertionError as e:
-                    introspection += "\nArgs:\n" + text_type(e)
+                    introspection += "\nArgs:\n" + str(e)
                 try:
                     assert actual_kwargs == kwargs
                 except AssertionError as e:
-                    introspection += "\nKwargs:\n" + text_type(e)
+                    introspection += "\nKwargs:\n" + str(e)
 
                 if introspection:
                     msg += "\n\npytest introspection follows:\n" + introspection
@@ -324,7 +309,7 @@ def unwrap_assert_methods():
             # so we need to catch this error here and ignore it;
             # unfortunately there's no public API to check if a patch
             # has been started, so catching the error it is
-            if text_type(e) == "stop called on unstarted patcher":
+            if str(e) == "stop called on unstarted patcher":
                 pass
             else:
                 raise

tests/test_pytest_mock.py

@@ -14,7 +14,7 @@
 )
 
 # Python 3.8 changed the output formatting (bpo-35500), which has been ported to mock 3.0
-NEW_FORMATTING = sys.version_info >= (3, 8) or sys.version_info[0] == 2
+NEW_FORMATTING = sys.version_info >= (3, 8)
 
 
 @pytest.fixture
@@ -32,7 +32,7 @@ def needs_assert_rewrite(pytestconfig):
         )
 
 
-class UnixFS(object):
+class UnixFS:
     """
     Wrapper to os functions to simulate a Unix file system, used for testing
     the mock fixture.
@@ -183,7 +183,7 @@ def test_repr_with_no_name(self, mocker):
     def test_repr_with_name(self, mocker):
         test_name = "funny walk"
         stub = mocker.stub(name=test_name)
-        assert "name={0!r}".format(test_name) in repr(stub)
+        assert "name={!r}".format(test_name) in repr(stub)
 
     def __test_failure_message(self, mocker, **kwargs):
         expected_name = kwargs.get("name") or "mock"
@@ -206,7 +206,7 @@ def test_failure_message_with_name(self, mocker, name):
 
 
 def test_instance_method_spy(mocker):
-    class Foo(object):
+    class Foo:
         def bar(self, arg):
             return arg * 2
 
@@ -222,7 +222,7 @@ def bar(self, arg):
 
 
 def test_instance_method_spy_exception(mocker):
-    class Foo(object):
+    class Foo:
         def bar(self, arg):
             raise Exception("Error with {}".format(arg))
 
@@ -266,7 +266,7 @@ def bar(self, x):
 
 @skip_pypy
 def test_instance_method_by_class_spy(mocker):
-    class Foo(object):
+    class Foo:
         def bar(self, arg):
             return arg * 2
 
@@ -281,7 +281,7 @@ def bar(self, arg):
 
 @skip_pypy
 def test_instance_method_by_subclass_spy(mocker):
-    class Base(object):
+    class Base:
         def bar(self, arg):
             return arg * 2
 
@@ -300,7 +300,7 @@ class Foo(Base):
 
 @skip_pypy
 def test_class_method_spy(mocker):
-    class Foo(object):
+    class Foo:
         @classmethod
         def bar(cls, arg):
             return arg * 2
@@ -314,9 +314,8 @@ def bar(cls, arg):
 
 
 @skip_pypy
-@pytest.mark.xfail(sys.version_info[0] == 2, reason="does not work on Python 2")
 def test_class_method_subclass_spy(mocker):
-    class Base(object):
+    class Base:
         @classmethod
         def bar(self, arg):
             return arg * 2
@@ -337,7 +336,7 @@ def test_class_method_with_metaclass_spy(mocker):
     class MetaFoo(type):
         pass
 
-    class Foo(object):
+    class Foo:
 
         __metaclass__ = MetaFoo
 
@@ -355,7 +354,7 @@ def bar(cls, arg):
 
 @skip_pypy
 def test_static_method_spy(mocker):
-    class Foo(object):
+    class Foo:
         @staticmethod
         def bar(arg):
             return arg * 2
@@ -369,9 +368,8 @@ def bar(arg):
 
 
 @skip_pypy
-@pytest.mark.xfail(sys.version_info[0] == 2, reason="does not work on Python 2")
 def test_static_method_subclass_spy(mocker):
-    class Base(object):
+    class Base:
         @staticmethod
         def bar(arg):
             return arg * 2
@@ -442,10 +440,6 @@ def assert_argument_introspection(left, right):
         raise AssertionError("DID NOT RAISE")
 
 
-@pytest.mark.skipif(
-    sys.version_info[:2] == (3, 4),
-    reason="assert_not_called not available in Python 3.4",
-)
 def test_assert_not_called_wrapper(mocker):
     stub = mocker.stub()
     stub.assert_not_called()
@@ -498,8 +492,8 @@ def test_assert_called_wrapper(mocker):
 def test_assert_called_args_with_introspection(mocker):
     stub = mocker.stub()
 
-    complex_args = ("a", 1, set(["test"]))
-    wrong_args = ("b", 2, set(["jest"]))
+    complex_args = ("a", 1, {"test"})
+    wrong_args = ("b", 2, {"jest"})
 
     stub(*complex_args)
     stub.assert_called_with(*complex_args)
@@ -631,7 +625,6 @@ def test_foo(mocker):
     assert result.stdout.lines == []
 
 
-@pytest.mark.skipif(sys.version_info[0] < 3, reason="Py3 only")
 def test_standalone_mock(testdir):
     """Check that the "mock_use_standalone" is being used.
     """
@@ -720,7 +713,7 @@ def test_assert_called_with_unicode_arguments(mocker):
     stub(b"l\xc3\xb6k".decode("UTF-8"))
 
     with pytest.raises(AssertionError):
-        stub.assert_called_with(u"lak")
+        stub.assert_called_with("lak")
 
 
 def test_plain_stopall(testdir):
@@ -745,15 +738,15 @@ def test_get_random_number(mocker):
 
 
 def test_abort_patch_object_context_manager(mocker):
-    class A(object):
+    class A:
         def doIt(self):
             return False
 
     a = A()
 
     with pytest.raises(ValueError) as excinfo:
         with mocker.patch.object(a, "doIt", return_value=True):
-            assert a.doIt() == True
+            assert a.doIt() is True
 
     expected_error_msg = (
         "Using mocker in a with context is not supported. "
@@ -803,7 +796,7 @@ def test_foo(mocker):
     result = testdir.runpytest()
     result.stdout.fnmatch_lines("* 1 passed *")
 
-    kwargs = {"legacy": True} if sys.version_info[0] >= 3 else {}
+    kwargs = {"legacy": True}
     assert compileall.compile_file(str(py_fn), **kwargs)
 
     pyc_fn = str(py_fn) + "c"

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36,37,38}, linting, norewrite
+envlist = py{35,36,37,38}, linting, norewrite
 
 [testenv]
 passenv = USER USERNAME