Upgrade Python syntax with pyupgrade --py3-plus

Author: hugovk

src/pytest_mock/plugin.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import functools
 import inspect
 import sys
@@ -39,7 +37,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.
@@ -136,7 +134,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.

tests/test_pytest_mock.py

@@ -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.
@@ -205,7 +205,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"
@@ -228,7 +228,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
 
@@ -246,7 +246,7 @@ def bar(self, arg):
 def test_instance_method_spy_exception(mocker):
     excepted_message = "foo"
 
-    class Foo(object):
+    class Foo:
         def bar(self, arg):
             raise Exception(excepted_message)
 
@@ -264,7 +264,7 @@ def bar(self, arg):
 
 @skip_pypy
 def test_instance_method_by_class_spy(mocker):
-    class Foo(object):
+    class Foo:
         def bar(self, arg):
             return arg * 2
 
@@ -279,7 +279,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
 
@@ -298,7 +298,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,7 +314,7 @@ 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
@@ -335,7 +335,7 @@ def test_class_method_with_metaclass_spy(mocker):
     class MetaFoo(type):
         pass
 
-    class Foo(object):
+    class Foo:
 
         __metaclass__ = MetaFoo
 
@@ -353,7 +353,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,7 +369,7 @@ 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
@@ -492,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)
@@ -714,7 +714,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):
@@ -739,7 +739,7 @@ def test_get_random_number(mocker):
 
 
 def test_abort_patch_object_context_manager(mocker):
-    class A(object):
+    class A:
         def doIt(self):
             return False