Replace type('') with six.text_type (encode#6482)

jdufresne · carltongibson · commit 9d06e43d05ab · 2019-03-05T12:11:46.000+01:00
As all source files import unicode_literals, type('') is always
equivalent to six.text_type (str on Python 3 and unicode on Python 2).
Removes the need to call type(), is more explicit, and will be easier to
catch places to change for when it is time to eventually drop Python 2.
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1486,7 +1486,7 @@ def get_value(self, dictionary):
         return dictionary.get(self.field_name, empty)
 
     def to_internal_value(self, data):
-        if isinstance(data, type('')) or not hasattr(data, '__iter__'):
+        if isinstance(data, six.text_type) or not hasattr(data, '__iter__'):
             self.fail('not_a_list', input_type=type(data).__name__)
         if not self.allow_empty and len(data) == 0:
             self.fail('empty')
@@ -1660,7 +1660,7 @@ def to_internal_value(self, data):
         """
         if html.is_html_input(data):
             data = html.parse_html_list(data, default=[])
-        if isinstance(data, (type(''), Mapping)) or not hasattr(data, '__iter__'):
+        if isinstance(data, (six.text_type, Mapping)) or not hasattr(data, '__iter__'):
             self.fail('not_a_list', input_type=type(data).__name__)
         if not self.allow_empty and len(data) == 0:
             self.fail('empty')
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
@@ -518,7 +518,7 @@ def get_value(self, dictionary):
         return dictionary.get(self.field_name, empty)
 
     def to_internal_value(self, data):
-        if isinstance(data, type('')) or not hasattr(data, '__iter__'):
+        if isinstance(data, six.text_type) or not hasattr(data, '__iter__'):
             self.fail('not_a_list', input_type=type(data).__name__)
         if not self.allow_empty and len(data) == 0:
             self.fail('empty')
diff --git a/tests/test_pagination.py b/tests/test_pagination.py
@@ -5,6 +5,7 @@
 from django.core.paginator import Paginator as DjangoPaginator
 from django.db import models
 from django.test import TestCase
+from django.utils import six
 
 from rest_framework import (
     exceptions, filters, generics, pagination, serializers, status
@@ -207,7 +208,7 @@ def test_no_page_number(self):
             ]
         }
         assert self.pagination.display_page_controls
-        assert isinstance(self.pagination.to_html(), type(''))
+        assert isinstance(self.pagination.to_html(), six.text_type)
 
     def test_second_page(self):
         request = Request(factory.get('/', {'page': 2}))
@@ -313,7 +314,7 @@ def test_no_page_number(self):
             ]
         }
         assert not self.pagination.display_page_controls
-        assert isinstance(self.pagination.to_html(), type(''))
+        assert isinstance(self.pagination.to_html(), six.text_type)
 
     def test_invalid_page(self):
         request = Request(factory.get('/', {'page': 'invalid'}))
@@ -368,7 +369,7 @@ def test_no_offset(self):
             ]
         }
         assert self.pagination.display_page_controls
-        assert isinstance(self.pagination.to_html(), type(''))
+        assert isinstance(self.pagination.to_html(), six.text_type)
 
     def test_pagination_not_applied_if_limit_or_default_limit_not_set(self):
         class MockPagination(pagination.LimitOffsetPagination):
@@ -631,7 +632,7 @@ def test_cursor_pagination(self):
         assert current == [1, 1, 1, 1, 1]
         assert next == [1, 2, 3, 4, 4]
 
-        assert isinstance(self.pagination.to_html(), type(''))
+        assert isinstance(self.pagination.to_html(), six.text_type)
 
     def test_cursor_pagination_with_page_size(self):
         (previous, current, next, previous_url, next_url) = self.get_pages('/?page_size=20')
diff --git a/tests/test_validation.py b/tests/test_validation.py
@@ -5,6 +5,7 @@
 from django.core.validators import MaxValueValidator, RegexValidator
 from django.db import models
 from django.test import TestCase
+from django.utils import six
 
 from rest_framework import generics, serializers, status
 from rest_framework.test import APIRequestFactory
@@ -111,7 +112,7 @@ def test_serializer_errors_has_only_invalid_data_error(self):
         assert not serializer.is_valid()
         assert serializer.errors == {
             'non_field_errors': [
-                'Invalid data. Expected a dictionary, but got %s.' % type('').__name__
+                'Invalid data. Expected a dictionary, but got %s.' % six.text_type.__name__
             ]
         }
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`from django.core.paginator import Paginator as DjangoPaginator`
`6`	`6`	`from django.db import models`
`7`	`7`	`from django.test import TestCase`
	`8`	`+from django.utils import six`
`8`	`9`
`9`	`10`	`from rest_framework import (`
`10`	`11`	`exceptions, filters, generics, pagination, serializers, status`
`@@ -207,7 +208,7 @@ def test_no_page_number(self):`
`207`	`208`	`]`
`208`	`209`	`}`
`209`	`210`	`assert self.pagination.display_page_controls`
`210`		`- assert isinstance(self.pagination.to_html(), type(''))`
	`211`	`+ assert isinstance(self.pagination.to_html(), six.text_type)`
`211`	`212`
`212`	`213`	`def test_second_page(self):`
`213`	`214`	`request = Request(factory.get('/', {'page': 2}))`
`@@ -313,7 +314,7 @@ def test_no_page_number(self):`
`313`	`314`	`]`
`314`	`315`	`}`
`315`	`316`	`assert not self.pagination.display_page_controls`
`316`		`- assert isinstance(self.pagination.to_html(), type(''))`
	`317`	`+ assert isinstance(self.pagination.to_html(), six.text_type)`
`317`	`318`
`318`	`319`	`def test_invalid_page(self):`
`319`	`320`	`request = Request(factory.get('/', {'page': 'invalid'}))`
`@@ -368,7 +369,7 @@ def test_no_offset(self):`
`368`	`369`	`]`
`369`	`370`	`}`
`370`	`371`	`assert self.pagination.display_page_controls`
`371`		`- assert isinstance(self.pagination.to_html(), type(''))`
	`372`	`+ assert isinstance(self.pagination.to_html(), six.text_type)`
`372`	`373`
`373`	`374`	`def test_pagination_not_applied_if_limit_or_default_limit_not_set(self):`
`374`	`375`	`class MockPagination(pagination.LimitOffsetPagination):`
`@@ -631,7 +632,7 @@ def test_cursor_pagination(self):`
`631`	`632`	`assert current == [1, 1, 1, 1, 1]`
`632`	`633`	`assert next == [1, 2, 3, 4, 4]`
`633`	`634`
`634`		`- assert isinstance(self.pagination.to_html(), type(''))`
	`635`	`+ assert isinstance(self.pagination.to_html(), six.text_type)`
`635`	`636`
`636`	`637`	`def test_cursor_pagination_with_page_size(self):`
`637`	`638`	`(previous, current, next, previous_url, next_url) = self.get_pages('/?page_size=20')`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`from django.core.validators import MaxValueValidator, RegexValidator`
`6`	`6`	`from django.db import models`
`7`	`7`	`from django.test import TestCase`
	`8`	`+from django.utils import six`
`8`	`9`
`9`	`10`	`from rest_framework import generics, serializers, status`
`10`	`11`	`from rest_framework.test import APIRequestFactory`
`@@ -111,7 +112,7 @@ def test_serializer_errors_has_only_invalid_data_error(self):`
`111`	`112`	`assert not serializer.is_valid()`
`112`	`113`	`assert serializer.errors == {`
`113`	`114`	`'non_field_errors': [`
`114`		`- 'Invalid data. Expected a dictionary, but got %s.' % type('').__name__`
	`115`	`+ 'Invalid data. Expected a dictionary, but got %s.' % six.text_type.__name__`
`115`	`116`	`]`
`116`	`117`	`}`
`117`	`118`