diff --git a/tests/test_description.py b/tests/test_description.py index 65cf01aa6..ae00fe4a9 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -153,7 +153,7 @@ class TestViewNamesAndDescriptions(TestCase): # use a mock object instead of gettext_lazy to ensure that we can't end # up with a test case string in our l10n catalog - class MockLazyStr(object): + class MockLazyStr: def __init__(self, string): self.s = string diff --git a/tests/test_encoders.py b/tests/test_encoders.py index 12eca8105..c66954b80 100644 --- a/tests/test_encoders.py +++ b/tests/test_encoders.py @@ -10,7 +10,7 @@ from rest_framework.compat import coreapi from rest_framework.utils.encoders import JSONEncoder -class MockList(object): +class MockList: def tolist(self): return [1, 2, 3] diff --git a/tests/test_fields.py b/tests/test_fields.py index 12c936b22..1e04883de 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -192,7 +192,7 @@ class TestSource: class ExampleSerializer(serializers.Serializer): example_field = serializers.CharField(source='example_callable') - class ExampleInstance(object): + class ExampleInstance: def example_callable(self): return 'example callable value' @@ -203,7 +203,7 @@ class TestSource: class ExampleSerializer(serializers.Serializer): example_field = serializers.CharField(source='example_callable', read_only=True) - class ExampleInstance(object): + class ExampleInstance: def example_callable(self): raise AttributeError('method call failed') diff --git a/tests/test_generateschema.py b/tests/test_generateschema.py index 915c6ea05..d09b668ec 100644 --- a/tests/test_generateschema.py +++ b/tests/test_generateschema.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import pytest from django.conf.urls import url from django.core.management import call_command diff --git a/tests/test_htmlrenderer.py b/tests/test_htmlrenderer.py index fdce39f23..9ae3d0b8f 100644 --- a/tests/test_htmlrenderer.py +++ b/tests/test_htmlrenderer.py @@ -45,7 +45,7 @@ urlpatterns = [ @override_settings(ROOT_URLCONF='tests.test_htmlrenderer') class TemplateHTMLRendererTests(TestCase): def setUp(self): - class MockResponse(object): + class MockResponse: template_name = None self.mock_response = MockResponse() self._monkey_patch_get_template() @@ -103,14 +103,14 @@ class TemplateHTMLRendererTests(TestCase): def test_get_template_names_returns_view_template_name(self): renderer = TemplateHTMLRenderer() - class MockResponse(object): + class MockResponse: template_name = None - class MockView(object): + class MockView: def get_template_names(self): return ['template from get_template_names method'] - class MockView2(object): + class MockView2: template_name = 'template from template_name attribute' template_name = renderer.get_template_names(self.mock_response, diff --git a/tests/test_middleware.py b/tests/test_middleware.py index 9df7d8e3e..28a5e558a 100644 --- a/tests/test_middleware.py +++ b/tests/test_middleware.py @@ -22,7 +22,7 @@ urlpatterns = [ ] -class RequestUserMiddleware(object): +class RequestUserMiddleware: def __init__(self, get_response): self.get_response = get_response @@ -34,7 +34,7 @@ class RequestUserMiddleware(object): return response -class RequestPOSTMiddleware(object): +class RequestPOSTMiddleware: def __init__(self, get_response): self.get_response = get_response diff --git a/tests/test_negotiation.py b/tests/test_negotiation.py index d74a10063..089a86c62 100644 --- a/tests/test_negotiation.py +++ b/tests/test_negotiation.py @@ -78,7 +78,7 @@ class TestAcceptedMediaType(TestCase): assert str(mediatype) == 'test/*; foo=bar' def test_raise_error_if_no_suitable_renderers_found(self): - class MockRenderer(object): + class MockRenderer: format = 'xml' renderers = [MockRenderer()] with pytest.raises(Http404): diff --git a/tests/test_pagination.py b/tests/test_pagination.py index e377beade..e1804c2a1 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -795,11 +795,11 @@ class TestCursorPagination(CursorPaginationTestsMixin): """ def setup(self): - class MockObject(object): + class MockObject: def __init__(self, idx): self.created = idx - class MockQuerySet(object): + class MockQuerySet: def __init__(self, items): self.items = items diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 42d49b794..e77950be9 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -39,7 +39,7 @@ class TestFormParser(TestCase): class TestFileUploadParser(TestCase): def setUp(self): - class MockRequest(object): + class MockRequest: pass self.stream = io.BytesIO( "Test text file".encode('utf-8') diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 30e696fcb..2d7e64b37 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -345,7 +345,7 @@ class JSONRendererTests(TestCase): self.assertEqual(data, {'key': 'string value', '2': 3}) def test_render_obj_with_getitem(self): - class DictLike(object): + class DictLike: def __init__(self): self._dict = {} @@ -644,7 +644,7 @@ class BrowsableAPIRendererTests(URLPatternsTestCase): assert self.renderer.get_description({}, status_code=403) == '' def test_get_filter_form_returns_none_if_data_is_not_list_instance(self): - class DummyView(object): + class DummyView: get_queryset = None filter_backends = None diff --git a/tests/test_reverse.py b/tests/test_reverse.py index b9ad48741..9ab1667c5 100644 --- a/tests/test_reverse.py +++ b/tests/test_reverse.py @@ -17,7 +17,7 @@ urlpatterns = [ ] -class MockVersioningScheme(object): +class MockVersioningScheme: def __init__(self, raise_error=False): self.raise_error = raise_error diff --git a/tests/test_schemas.py b/tests/test_schemas.py index d3bd43073..f99eb55d1 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -29,7 +29,7 @@ from .models import BasicModel, ForeignKeySource factory = APIRequestFactory() -class MockUser(object): +class MockUser: def is_authenticated(self): return True diff --git a/tests/test_serializer.py b/tests/test_serializer.py index e3f676888..8a1df04ec 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -157,7 +157,7 @@ class TestSerializer: to_internal_value() is expected to return a dict, but subclasses may return application specific type. """ - class Point(object): + class Point: def __init__(self, srid, x, y): self.srid = srid self.coords = (x, y) diff --git a/tests/test_throttling.py b/tests/test_throttling.py index 6ba916281..b20b6a809 100644 --- a/tests/test_throttling.py +++ b/tests/test_throttling.py @@ -295,7 +295,7 @@ class ScopedRateThrottleTests(TestCase): assert response.status_code == 200 def test_get_cache_key_returns_correct_key_if_user_is_authenticated(self): - class DummyView(object): + class DummyView: throttle_scope = 'user' request = Request(HttpRequest()) diff --git a/tests/test_versioning.py b/tests/test_versioning.py index 7e650e275..526df8292 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -321,7 +321,7 @@ class TestHyperlinkedRelatedField(URLPatternsTestCase, APITestCase): def setUp(self): super(TestHyperlinkedRelatedField, self).setUp() - class MockQueryset(object): + class MockQueryset: def get(self, pk): return 'object %s' % pk diff --git a/tests/utils.py b/tests/utils.py index 509e6a102..06e5b9abe 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -2,7 +2,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.urls import NoReverseMatch -class MockObject(object): +class MockObject: def __init__(self, **kwargs): self._kwargs = kwargs for key, val in kwargs.items(): @@ -16,7 +16,7 @@ class MockObject(object): return '' % kwargs_str -class MockQueryset(object): +class MockQueryset: def __init__(self, iterable): self.items = iterable @@ -33,7 +33,7 @@ class MockQueryset(object): raise ObjectDoesNotExist() -class BadType(object): +class BadType: """ When used as a lookup with a `MockQueryset`, these objects will raise a `TypeError`, as occurs in Django when making