From c6d6237ea1dde6ea620fb14d0105b5b7bf5cf84a Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Sun, 8 Jan 2017 15:49:44 +0200 Subject: [PATCH] Remove redundant parentheses in return statements --- rest_framework/authentication.py | 6 +++--- rest_framework/fields.py | 8 ++++---- rest_framework/filters.py | 2 +- rest_framework/pagination.py | 2 +- rest_framework/relations.py | 2 +- rest_framework/request.py | 10 +++++----- rest_framework/schemas.py | 2 +- rest_framework/serializers.py | 2 +- rest_framework/test.py | 2 +- rest_framework/throttling.py | 4 ++-- rest_framework/utils/serializer_helpers.py | 4 ++-- rest_framework/views.py | 6 +++--- tests/test_model_serializer.py | 4 ++-- tests/test_pagination.py | 4 ++-- tests/test_versioning.py | 8 ++++---- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index cb9608a3c..953f66b12 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -101,7 +101,7 @@ class BasicAuthentication(BaseAuthentication): if not user.is_active: raise exceptions.AuthenticationFailed(_('User inactive or deleted.')) - return (user, None) + return user, None def authenticate_header(self, request): return 'Basic realm="%s"' % self.www_authenticate_realm @@ -128,7 +128,7 @@ class SessionAuthentication(BaseAuthentication): self.enforce_csrf(request) # CSRF passed with authenticated user - return (user, None) + return user, None def enforce_csrf(self, request): """ @@ -197,7 +197,7 @@ class TokenAuthentication(BaseAuthentication): if not token.user.is_active: raise exceptions.AuthenticationFailed(_('User inactive or deleted.')) - return (token.user, token) + return token.user, token def authenticate_header(self, request): return self.keyword diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f68b5eaf3..9e677c772 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -489,21 +489,21 @@ class Field(object): have validation applied as normal. """ if self.read_only: - return (True, self.get_default()) + return True, self.get_default() if data is empty: if getattr(self.root, 'partial', False): raise SkipField() if self.required: self.fail('required') - return (True, self.get_default()) + return True, self.get_default() if data is None: if not self.allow_null: self.fail('null') - return (True, None) + return True, None - return (False, data) + return False, data def run_validation(self, data=empty): """ diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 00e753d42..268c1e66e 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -192,7 +192,7 @@ class OrderingFilter(BaseFilterBackend): def get_default_ordering(self, view): ordering = getattr(view, 'ordering', None) if isinstance(ordering, six.string_types): - return (ordering,) + return ordering, return ordering def get_default_valid_fields(self, queryset, view, context={}): diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 8ccdc342c..2c4b4901d 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -666,7 +666,7 @@ class CursorPagination(BasePagination): ) if isinstance(ordering, six.string_types): - return (ordering,) + return ordering, return tuple(ordering) def decode_cursor(self, request): diff --git a/rest_framework/relations.py b/rest_framework/relations.py index c1898d0d8..a518790cd 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -43,7 +43,7 @@ class Hyperlink(six.text_type): return ret def __getnewargs__(self): - return(str(self), self.name,) + return str(self), self.name @property def name(self): diff --git a/rest_framework/request.py b/rest_framework/request.py index 7121689d2..d53091e1c 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -117,7 +117,7 @@ class ForcedAuthentication(object): self.force_token = force_token def authenticate(self, request): - return (self.force_user, self.force_token) + return self.force_user, self.force_token class Request(object): @@ -295,7 +295,7 @@ class Request(object): # request was made with 'multipart/form-data', then the request stream # will already have been exhausted. if self._supports_form_parsing(): - return (self._request.POST, self._request.FILES) + return self._request.POST, self._request.FILES stream = None if stream is None or media_type is None: @@ -304,7 +304,7 @@ class Request(object): else: empty_data = {} empty_files = MultiValueDict() - return (empty_data, empty_files) + return empty_data, empty_files parser = self.negotiator.select_parser(self, self.parsers) @@ -326,10 +326,10 @@ class Request(object): # Parser classes may return the raw data, or a # DataAndFiles object. Unpack the result as required. try: - return (parsed.data, parsed.files) + return parsed.data, parsed.files except AttributeError: empty_files = MultiValueDict() - return (parsed, empty_files) + return parsed, empty_files def _authenticate(self): """ diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 112f4d8c4..d282d5cf9 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -110,7 +110,7 @@ def endpoint_ordering(endpoint): 'PATCH': 3, 'DELETE': 4 }.get(method, 5) - return (path, method_priority) + return path, method_priority class EndpointInspector(object): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 3556447bb..a7d386c35 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1301,7 +1301,7 @@ class ModelSerializer(Serializer): ('dict of updated extra kwargs', 'mapping of hidden fields') """ if getattr(self.Meta, 'validators', None) is not None: - return (extra_kwargs, {}) + return extra_kwargs, {} model = getattr(self.Meta, 'model') model_fields = self._get_model_fields( diff --git a/rest_framework/test.py b/rest_framework/test.py index 241f94c91..3df3873bf 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -156,7 +156,7 @@ class APIRequestFactory(DjangoRequestFactory): """ if data is None: - return ('', content_type) + return '', content_type assert format is None or content_type is None, ( 'You may not set both `format` and `content_type`.' diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 57f24d13f..dddf41546 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -103,11 +103,11 @@ class SimpleRateThrottle(BaseThrottle): , """ if rate is None: - return (None, None) + return None, None num, period = rate.split('/') num_requests = int(num) duration = {'s': 1, 'm': 60, 'h': 3600, 'd': 86400}[period[0]] - return (num_requests, duration) + return num_requests, duration def allow_request(self, request, view): """ diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index 4734332af..e32eec133 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -28,7 +28,7 @@ class ReturnDict(OrderedDict): def __reduce__(self): # Pickling these objects will drop the .serializer backlink, # but preserve the raw data. - return (dict, (dict(self),)) + return dict, (dict(self),) class ReturnList(list): @@ -48,7 +48,7 @@ class ReturnList(list): def __reduce__(self): # Pickling these objects will drop the .serializer backlink, # but preserve the raw data. - return (list, (list(self),)) + return list, (list(self),) class BoundField(object): diff --git a/rest_framework/views.py b/rest_framework/views.py index 92911e8df..f99d88e36 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -305,7 +305,7 @@ class APIView(View): return conneg.select_renderer(request, renderers, self.format_kwarg) except Exception: if force: - return (renderers[0], renderers[0].media_type) + return renderers[0], renderers[0].media_type raise def perform_authentication(self, request): @@ -355,9 +355,9 @@ class APIView(View): incoming request. Returns a two-tuple of (version, versioning_scheme) """ if self.versioning_class is None: - return (None, None) + return None, None scheme = self.versioning_class() - return (scheme.determine_version(request, *args, **kwargs), scheme) + return scheme.determine_version(request, *args, **kwargs), scheme # Dispatch methods diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index b839f56ca..aa7693e7c 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -601,7 +601,7 @@ class DisplayValueTargetModel(models.Model): name = models.CharField(max_length=100) def __str__(self): - return '%s Color' % (self.name) + return '%s Color' % self.name class DisplayValueModel(models.Model): @@ -629,7 +629,7 @@ class TestRelationalFieldDisplayValue(TestCase): def test_custom_display_value(self): class TestField(serializers.PrimaryKeyRelatedField): def display_value(self, instance): - return 'My %s Color' % (instance.name) + return 'My %s Color' % instance.name class TestSerializer(serializers.ModelSerializer): color = TestField(queryset=DisplayValueTargetModel.objects.all()) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 9f2e1c57c..cf8eb6a66 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -705,7 +705,7 @@ class TestCursorPagination(CursorPaginationTestsMixin): else: previous = None - return (previous, current, next, previous_url, next_url) + return previous, current, next, previous_url, next_url class CursorPaginationModel(models.Model): @@ -763,7 +763,7 @@ class TestCursorPaginationWithValueQueryset(CursorPaginationTestsMixin, TestCase else: previous = None - return (previous, current, next, previous_url, next_url) + return previous, current, next, previous_url, next_url def test_get_displayed_page_numbers(): diff --git a/tests/test_versioning.py b/tests/test_versioning.py index 195f3fec1..119cdf2e0 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -48,7 +48,7 @@ class AllowedVersionsView(RequestVersionView): def determine_version(self, request, *args, **kwargs): scheme = self.versioning_class() scheme.allowed_versions = ('v1', 'v2') - return (scheme.determine_version(request, *args, **kwargs), scheme) + return scheme.determine_version(request, *args, **kwargs), scheme class AllowedAndDefaultVersionsView(RequestVersionView): @@ -56,14 +56,14 @@ class AllowedAndDefaultVersionsView(RequestVersionView): scheme = self.versioning_class() scheme.allowed_versions = ('v1', 'v2') scheme.default_version = 'v2' - return (scheme.determine_version(request, *args, **kwargs), scheme) + return scheme.determine_version(request, *args, **kwargs), scheme class AllowedWithNoneVersionsView(RequestVersionView): def determine_version(self, request, *args, **kwargs): scheme = self.versioning_class() scheme.allowed_versions = ('v1', 'v2', None) - return (scheme.determine_version(request, *args, **kwargs), scheme) + return scheme.determine_version(request, *args, **kwargs), scheme class AllowedWithNoneAndDefaultVersionsView(RequestVersionView): @@ -71,7 +71,7 @@ class AllowedWithNoneAndDefaultVersionsView(RequestVersionView): scheme = self.versioning_class() scheme.allowed_versions = ('v1', 'v2', None) scheme.default_version = 'v2' - return (scheme.determine_version(request, *args, **kwargs), scheme) + return scheme.determine_version(request, *args, **kwargs), scheme factory = APIRequestFactory()