remove more python2 compat codes from tests

This commit is contained in:
Asif Saif Uddin 2019-03-10 11:51:13 +06:00
parent b1b56eef1a
commit 1b817d92b4
16 changed files with 24 additions and 26 deletions

View File

@ -153,7 +153,7 @@ class TestViewNamesAndDescriptions(TestCase):
# use a mock object instead of gettext_lazy to ensure that we can't end # 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 # up with a test case string in our l10n catalog
class MockLazyStr(object): class MockLazyStr:
def __init__(self, string): def __init__(self, string):
self.s = string self.s = string

View File

@ -10,7 +10,7 @@ from rest_framework.compat import coreapi
from rest_framework.utils.encoders import JSONEncoder from rest_framework.utils.encoders import JSONEncoder
class MockList(object): class MockList:
def tolist(self): def tolist(self):
return [1, 2, 3] return [1, 2, 3]

View File

@ -192,7 +192,7 @@ class TestSource:
class ExampleSerializer(serializers.Serializer): class ExampleSerializer(serializers.Serializer):
example_field = serializers.CharField(source='example_callable') example_field = serializers.CharField(source='example_callable')
class ExampleInstance(object): class ExampleInstance:
def example_callable(self): def example_callable(self):
return 'example callable value' return 'example callable value'
@ -203,7 +203,7 @@ class TestSource:
class ExampleSerializer(serializers.Serializer): class ExampleSerializer(serializers.Serializer):
example_field = serializers.CharField(source='example_callable', read_only=True) example_field = serializers.CharField(source='example_callable', read_only=True)
class ExampleInstance(object): class ExampleInstance:
def example_callable(self): def example_callable(self):
raise AttributeError('method call failed') raise AttributeError('method call failed')

View File

@ -1,5 +1,3 @@
from __future__ import unicode_literals
import pytest import pytest
from django.conf.urls import url from django.conf.urls import url
from django.core.management import call_command from django.core.management import call_command

View File

@ -45,7 +45,7 @@ urlpatterns = [
@override_settings(ROOT_URLCONF='tests.test_htmlrenderer') @override_settings(ROOT_URLCONF='tests.test_htmlrenderer')
class TemplateHTMLRendererTests(TestCase): class TemplateHTMLRendererTests(TestCase):
def setUp(self): def setUp(self):
class MockResponse(object): class MockResponse:
template_name = None template_name = None
self.mock_response = MockResponse() self.mock_response = MockResponse()
self._monkey_patch_get_template() self._monkey_patch_get_template()
@ -103,14 +103,14 @@ class TemplateHTMLRendererTests(TestCase):
def test_get_template_names_returns_view_template_name(self): def test_get_template_names_returns_view_template_name(self):
renderer = TemplateHTMLRenderer() renderer = TemplateHTMLRenderer()
class MockResponse(object): class MockResponse:
template_name = None template_name = None
class MockView(object): class MockView:
def get_template_names(self): def get_template_names(self):
return ['template from get_template_names method'] return ['template from get_template_names method']
class MockView2(object): class MockView2:
template_name = 'template from template_name attribute' template_name = 'template from template_name attribute'
template_name = renderer.get_template_names(self.mock_response, template_name = renderer.get_template_names(self.mock_response,

View File

@ -22,7 +22,7 @@ urlpatterns = [
] ]
class RequestUserMiddleware(object): class RequestUserMiddleware:
def __init__(self, get_response): def __init__(self, get_response):
self.get_response = get_response self.get_response = get_response
@ -34,7 +34,7 @@ class RequestUserMiddleware(object):
return response return response
class RequestPOSTMiddleware(object): class RequestPOSTMiddleware:
def __init__(self, get_response): def __init__(self, get_response):
self.get_response = get_response self.get_response = get_response

View File

@ -78,7 +78,7 @@ class TestAcceptedMediaType(TestCase):
assert str(mediatype) == 'test/*; foo=bar' assert str(mediatype) == 'test/*; foo=bar'
def test_raise_error_if_no_suitable_renderers_found(self): def test_raise_error_if_no_suitable_renderers_found(self):
class MockRenderer(object): class MockRenderer:
format = 'xml' format = 'xml'
renderers = [MockRenderer()] renderers = [MockRenderer()]
with pytest.raises(Http404): with pytest.raises(Http404):

View File

@ -795,11 +795,11 @@ class TestCursorPagination(CursorPaginationTestsMixin):
""" """
def setup(self): def setup(self):
class MockObject(object): class MockObject:
def __init__(self, idx): def __init__(self, idx):
self.created = idx self.created = idx
class MockQuerySet(object): class MockQuerySet:
def __init__(self, items): def __init__(self, items):
self.items = items self.items = items

View File

@ -39,7 +39,7 @@ class TestFormParser(TestCase):
class TestFileUploadParser(TestCase): class TestFileUploadParser(TestCase):
def setUp(self): def setUp(self):
class MockRequest(object): class MockRequest:
pass pass
self.stream = io.BytesIO( self.stream = io.BytesIO(
"Test text file".encode('utf-8') "Test text file".encode('utf-8')

View File

@ -345,7 +345,7 @@ class JSONRendererTests(TestCase):
self.assertEqual(data, {'key': 'string value', '2': 3}) self.assertEqual(data, {'key': 'string value', '2': 3})
def test_render_obj_with_getitem(self): def test_render_obj_with_getitem(self):
class DictLike(object): class DictLike:
def __init__(self): def __init__(self):
self._dict = {} self._dict = {}
@ -644,7 +644,7 @@ class BrowsableAPIRendererTests(URLPatternsTestCase):
assert self.renderer.get_description({}, status_code=403) == '' assert self.renderer.get_description({}, status_code=403) == ''
def test_get_filter_form_returns_none_if_data_is_not_list_instance(self): def test_get_filter_form_returns_none_if_data_is_not_list_instance(self):
class DummyView(object): class DummyView:
get_queryset = None get_queryset = None
filter_backends = None filter_backends = None

View File

@ -17,7 +17,7 @@ urlpatterns = [
] ]
class MockVersioningScheme(object): class MockVersioningScheme:
def __init__(self, raise_error=False): def __init__(self, raise_error=False):
self.raise_error = raise_error self.raise_error = raise_error

View File

@ -29,7 +29,7 @@ from .models import BasicModel, ForeignKeySource
factory = APIRequestFactory() factory = APIRequestFactory()
class MockUser(object): class MockUser:
def is_authenticated(self): def is_authenticated(self):
return True return True

View File

@ -157,7 +157,7 @@ class TestSerializer:
to_internal_value() is expected to return a dict, but subclasses may to_internal_value() is expected to return a dict, but subclasses may
return application specific type. return application specific type.
""" """
class Point(object): class Point:
def __init__(self, srid, x, y): def __init__(self, srid, x, y):
self.srid = srid self.srid = srid
self.coords = (x, y) self.coords = (x, y)

View File

@ -295,7 +295,7 @@ class ScopedRateThrottleTests(TestCase):
assert response.status_code == 200 assert response.status_code == 200
def test_get_cache_key_returns_correct_key_if_user_is_authenticated(self): def test_get_cache_key_returns_correct_key_if_user_is_authenticated(self):
class DummyView(object): class DummyView:
throttle_scope = 'user' throttle_scope = 'user'
request = Request(HttpRequest()) request = Request(HttpRequest())

View File

@ -321,7 +321,7 @@ class TestHyperlinkedRelatedField(URLPatternsTestCase, APITestCase):
def setUp(self): def setUp(self):
super(TestHyperlinkedRelatedField, self).setUp() super(TestHyperlinkedRelatedField, self).setUp()
class MockQueryset(object): class MockQueryset:
def get(self, pk): def get(self, pk):
return 'object %s' % pk return 'object %s' % pk

View File

@ -2,7 +2,7 @@ from django.core.exceptions import ObjectDoesNotExist
from django.urls import NoReverseMatch from django.urls import NoReverseMatch
class MockObject(object): class MockObject:
def __init__(self, **kwargs): def __init__(self, **kwargs):
self._kwargs = kwargs self._kwargs = kwargs
for key, val in kwargs.items(): for key, val in kwargs.items():
@ -16,7 +16,7 @@ class MockObject(object):
return '<MockObject %s>' % kwargs_str return '<MockObject %s>' % kwargs_str
class MockQueryset(object): class MockQueryset:
def __init__(self, iterable): def __init__(self, iterable):
self.items = iterable self.items = iterable
@ -33,7 +33,7 @@ class MockQueryset(object):
raise ObjectDoesNotExist() raise ObjectDoesNotExist()
class BadType(object): class BadType:
""" """
When used as a lookup with a `MockQueryset`, these objects When used as a lookup with a `MockQueryset`, these objects
will raise a `TypeError`, as occurs in Django when making will raise a `TypeError`, as occurs in Django when making