Bug Fixes for 0.3.5 version

nxexox · nxexox · commit 339ae56a3873 · 2019-07-22T23:59:38.000+05:00
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -8,6 +8,16 @@ Medium version numbers (0.x.0) may include API changes, in line with the [deprec
 
 Major version numbers (x.0.0) are reserved for substantial project milestones.
 
+### 0.3.5
+
+**Date:** [22th Jule 2019]
+
+* Fix for current work [`source`][SourceFieldAttribute] attribute for base fields class.
+* Fix exceptions `__str__` method.
+* Fix `GenericViews` `MRO`.
+* Added unbound `response_class` from all views.
+* Fix `ValidationError` arguments in views.
+
 ### 0.3.4
 
 **Date:** [22th Jule 2019]
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
@@ -8,12 +8,12 @@
          __/ |
         |___/
 """
-VERSION = (0, 3, 4)
+VERSION = (0, 3, 5)
 
 __title__ = 'Python-Rest-Framework'
 __author__ = 'Deys Timofey'
 __email__ = 'nxexox@gmail.com'
-__copyright__ = 'Copyright (c) 2018 Deys Timofey'
+__copyright__ = 'Copyright (c) 2019 Deys Timofey'
 __license__ = 'Apache License 2.0'
 __url__ = 'https://github.com/nxexox/python-rest-framework'
 __version__ = '.'.join(map(str, VERSION))
diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py
@@ -27,3 +27,6 @@ def __init__(self, detail=None, status=400):
         """
         self.detail = detail
         self.status = status
+
+    def __str__(self):
+        return 'rest_framework.exceptions.ApiException(detail={}, code={})'.format(self.detail, self.status)
diff --git a/rest_framework/serializers/exceptions.py b/rest_framework/serializers/exceptions.py
@@ -21,3 +21,8 @@ def __init__(self, code=None, *args, **kwargs):
         """
         super().__init__(*args, **kwargs)
         self.code = code
+
+    def __str__(self):
+        return 'rest_framework.serializers.exceptions.ValidationError(code={}, detail={}, code={})'.format(
+            self.code, self.detail, self.status
+        )
diff --git a/rest_framework/serializers/fields.py b/rest_framework/serializers/fields.py
@@ -103,7 +103,8 @@ def __init__(self, required=True, default=None, label=None, validators=None,
     def __deepcopy__(self, memo={}):
         return self.__class__(
             required=self.required, default=self.default, label=self.label,
-            validators=self._src_validators, error_messages=self._src_messages
+            validators=self._src_validators, error_messages=self._src_messages,
+            source=self.source
         )
 
     def bind(self, field_name, parent):
@@ -394,7 +395,8 @@ def __deepcopy__(self, memo={}):
             required=self.required, default=self.default, label=self.label,
             validators=self._src_validators, error_messages=self._src_messages,
             min_length=self.min_length, max_length=self.max_length,
-            trim_whitespace=self.trim_whitespace, allow_blank=self.allow_blank
+            trim_whitespace=self.trim_whitespace, allow_blank=self.allow_blank,
+            source=self.source
         )
 
     def run_validation(self, data=None):
@@ -487,7 +489,8 @@ def __deepcopy__(self, memo={}):
         return self.__class__(
             required=self.required, default=self.default, label=self.label,
             validators=self._src_validators, error_messages=self._src_messages,
-            min_value=self.min_value, max_value=self.max_value
+            min_value=self.min_value, max_value=self.max_value,
+            source=self.source
         )
 
     def to_internal_value(self, data):
@@ -562,7 +565,8 @@ def __deepcopy__(self, memo={}):
         return self.__class__(
             required=self.required, default=self.default, label=self.label,
             validators=self._src_validators, error_messages=self._src_messages,
-            min_value=self.min_value, max_value=self.max_value
+            min_value=self.min_value, max_value=self.max_value,
+            source=self.source
         )
 
     def to_internal_value(self, data):
@@ -822,7 +826,7 @@ def __deepcopy__(self, memo={}):
             required=self.required, default=self.default, label=self.label,
             validators=self._src_validators, error_messages=self._src_messages,
             child=self.child, min_length=self.min_length, max_length=self.max_length,
-            allow_empty=self.allow_empty
+            allow_empty=self.allow_empty, source=self.source
         )
 
     def to_internal_value(self, data):
@@ -892,7 +896,8 @@ def __deepcopy__(self, memo={}):
         return self.__class__(
             required=self.required, default=self.default, label=self.label,
             validators=self._src_validators, error_messages=self._src_messages,
-            format=getattr(self, 'format'), input_format=getattr(self, 'input_format')
+            format=getattr(self, 'format'), input_format=getattr(self, 'input_format'),
+            source=self.source
         )
 
     def to_internal_value(self, data):
@@ -991,7 +996,8 @@ def __deepcopy__(self, memo={}):
         return self.__class__(
             required=self.required, default=self.default, label=self.label,
             validators=self._src_validators, error_messages=self._src_messages,
-            format=getattr(self, 'format', None), input_format=getattr(self, 'input_format')
+            format=getattr(self, 'format', None), input_format=getattr(self, 'input_format'),
+            source=self.source
         )
 
     def to_internal_value(self, data):
@@ -1088,7 +1094,8 @@ def __deepcopy__(self, memo={}):
         return self.__class__(
             required=self.required, default=self.default, label=self.label,
             validators=self._src_validators, error_messages=self._src_messages,
-            format=getattr(self, 'format'), input_format=getattr(self, 'input_format')
+            format=getattr(self, 'format'), input_format=getattr(self, 'input_format'),
+            source=self.source
         )
 
     def to_internal_value(self, data):
@@ -1220,7 +1227,7 @@ def __deepcopy__(self, memo={}):
         return self.__class__(
             required=self.required, default=self.default, label=self.label,
             validators=self._src_validators, error_messages=self._src_messages,
-            child=self.child
+            child=self.child, source=self.source
         )
 
     def to_internal_value(self, data):
@@ -1305,7 +1312,8 @@ def __deepcopy__(self, memo={}):
         return self.__class__(
             required=self.required, default=self.default, label=self.label,
             validators=self._src_validators, error_messages=self._src_messages,
-            method_name_get=self.method_name_get, method_name_pop=self.method_name_pop
+            method_name_get=self.method_name_get, method_name_pop=self.method_name_pop,
+            source=self.source
         )
 
     def bind(self, field_name, parent):
diff --git a/rest_framework/serializers/serializers.py b/rest_framework/serializers/serializers.py
@@ -22,7 +22,7 @@
 
 LIST_SERIALIZER_KWARGS = (
     'required', 'default', 'label', 'error_messages', 'allow_empty',
-    'instance', 'data', 'min_length', 'max_length'
+    'instance', 'data', 'min_length', 'max_length', 'source'
 )  # The argument list for the ListSerializer to control the creation of many=True.
 
 
@@ -126,7 +126,7 @@ def __new__(cls, *args, **kwargs):
         return super(BaseSerializer, cls).__new__(cls)
 
     def __deepcopy__(self, memo={}):
-        return self.__class__(instance=self.instance, data=self.data)
+        return self.__class__(instance=self.instance, data=self.data, source=self.source)
 
     @classmethod
     def many_init(cls, *args, **kwargs):
@@ -313,8 +313,9 @@ def to_representation(self, instance):
         """
         res = OrderedDict()  # Attributes storage.
 
-        for field_name, field_val in six.iteritems(self.fields):
+        for _, field_val in six.iteritems(self.fields):
             # TODO: mini hack
+            field_name = field_val._get_field_name()
             if not isinstance(field_val, SerializerMethodField):
                 # We try to get the attribute.
                 try:
@@ -361,7 +362,8 @@ def _field_validation(self, fields_dict, data):
         """
         validated_data, errors = OrderedDict(), OrderedDict()
         # Running through the fields.
-        for field_name, field_obj in six.iteritems(fields_dict):
+        for _, field_obj in six.iteritems(fields_dict):
+            field_name = field_obj._get_field_name()
             try:
                 # Transform to python type and validate each field.
                 validated_val = field_obj.run_validation(data.get(field_name, None))
@@ -516,7 +518,8 @@ def __init__(self, child=None, allow_empty=None, *args, **kwargs):
     def __deepcopy__(self, memo={}):
         return self.__class__(
             instance=self.instance, data=self.data,
-            child=self.child, allow_empty=self.allow_empty
+            child=self.child, allow_empty=self.allow_empty,
+            source=self.source
         )
 
     def to_internal_value(self, data):
diff --git a/rest_framework/views/aiohttp/generics.py b/rest_framework/views/aiohttp/generics.py
@@ -33,7 +33,7 @@ class GetValidJsonApiGenericView(AioHTTPApiView, GetValidJsonMixin):
     pass
 
 
-class ApiGenericView(AioHTTPApiView, GetResponseMixin, GetSerializerMixin, GetValidJsonMixin):
+class ApiGenericView(AioHTTPApiView, GetResponseMixin, GetValidJsonMixin, GetSerializerMixin):
     """
     Generic Api view for GetResponse, GetSerializer, GetValidJsonMixin methods.
 
diff --git a/rest_framework/views/aiohttp/mixins.py b/rest_framework/views/aiohttp/mixins.py
@@ -37,7 +37,7 @@ def get_valid_json(self, parse_query=False, raise_exception=True):
             data.update(request_json)
         except JSONDecodeError:
             if raise_exception:
-                raise ValidationError('Not valid json.')
+                raise ValidationError(detail='Not valid json.')
 
         # Validate body request.
         serializer = self.get_request_serializer()
diff --git a/rest_framework/views/aiohttp/views.py b/rest_framework/views/aiohttp/views.py
@@ -77,4 +77,4 @@ def _dispatch(self, method, *args, **kwargs):
             return result
         except ApiException as e:
             # TODO: Not security. e.detail maybe anything
-            return self.response_class({'errors': e.detail}, status=e.status or 400)
+            return self.response_class.__func__(detail={'errors': e.detail}, status=e.status or 400)
diff --git a/rest_framework/views/base.py b/rest_framework/views/base.py
@@ -43,7 +43,7 @@ def _dispatch(self, method, *args, **kwargs):
             return method(*args, **kwargs)
         except ApiException as e:
             # TODO: Not security. e.detail maybe anything
-            return self.response_class(
+            return self.response_class.__func__(
                 {'errors': e.detail},
                 status=e.status or 400,
                 content_type=self.response_content_type
diff --git a/rest_framework/views/flask/generics.py b/rest_framework/views/flask/generics.py
@@ -33,7 +33,7 @@ class GetValidJsonApiGenericView(FlaskBaseApiView, GetValidJsonMixin):
     pass
 
 
-class ApiGenericView(FlaskBaseApiView, GetResponseMixin, GetSerializerMixin, GetValidJsonMixin):
+class ApiGenericView(FlaskBaseApiView, GetResponseMixin, GetValidJsonMixin, GetSerializerMixin):
     """
     Generic Api view for GetResponse, GetSerializer, GetValidJsonMixin methods.
 
@@ -65,7 +65,7 @@ class GetValidJsonApiGenericMethodView(FlaskBaseMethodView, GetValidJsonMixin):
     pass
 
 
-class ApiGenericMethodView(FlaskBaseMethodView, GetResponseMixin, GetSerializerMixin, GetValidJsonMixin):
+class ApiGenericMethodView(FlaskBaseMethodView, GetResponseMixin, GetValidJsonMixin, GetSerializerMixin):
     """
     Generic Api method view for GetResponse, GetSerializer, GetValidJsonMixin methods.
 
diff --git a/rest_framework/views/flask/mixins.py b/rest_framework/views/flask/mixins.py
@@ -35,7 +35,7 @@ def get_valid_json(self, parse_query=False, raise_exception=True):
             data.update(self.request_object.get_json())
         except JSONDecodeError:
             if raise_exception:
-                raise ValidationError('Not valid json.')
+                raise ValidationError(detail='Not valid json.')
 
         # Validate body request.
         serializer = self.get_request_serializer()
diff --git a/rest_framework/views/mixins.py b/rest_framework/views/mixins.py
@@ -105,7 +105,7 @@ class GetResponseMixin(GetSerializerMixin):
     response_content_type = 'application/json'
 
     def __new__(cls, *args, **kwargs):
-        res = super().__new__(cls, *args, **kwargs)
+        res = super().__new__(cls)
         # TODO: Not working
         if cls.response_class is None:
             raise AttributeError(
@@ -152,7 +152,7 @@ def get_response(self, obj=None, is_serialized=True,
         if is_serialized and obj is not None:
             data = self.get_response_serializer()(obj).data
 
-        return self.response_class(
+        return self.response_class.__func__(
             data, status=status_code,
             content_type=self.response_content_type
         )
diff --git a/rest_framework/views/sanic/generics.py b/rest_framework/views/sanic/generics.py
@@ -33,7 +33,7 @@ class GetValidJsonApiGenericMethodView(SanicApiMethodView, GetValidJsonMixin):
     pass
 
 
-class ApiGenericMethodView(SanicApiMethodView, GetResponseMixin, GetSerializerMixin, GetValidJsonMixin):
+class ApiGenericMethodView(SanicApiMethodView, GetResponseMixin, GetValidJsonMixin, GetSerializerMixin):
     """
     Generic Api method view for GetResponse, GetSerializer, GetValidJsonMixin methods.
 
@@ -65,7 +65,7 @@ class GetValidJsonApiGenericCompositionView(SanicApiCompositionView, GetValidJso
     pass
 
 
-class ApiGenericCompositionView(SanicApiCompositionView, GetResponseMixin, GetSerializerMixin, GetValidJsonMixin):
+class ApiGenericCompositionView(SanicApiCompositionView, GetResponseMixin, GetValidJsonMixin, GetSerializerMixin):
     """
     Generic Api composition view for GetResponse, GetSerializer, GetValidJsonMixin methods.
 
diff --git a/rest_framework/views/sanic/mixins.py b/rest_framework/views/sanic/mixins.py
@@ -34,7 +34,7 @@ def get_valid_json(self, parse_query=False, raise_exception=True):
             data.update(self.request_object.json)
         except JSONDecodeError:
             if raise_exception:
-                raise ValidationError('Not valid json.')
+                raise ValidationError(detail='Not valid json.')
 
         # Validate body request.
         serializer = self.get_request_serializer()
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,18 +1,12 @@
 import unittest
 
-from tests.test_fields import *
-from tests.test_serializers import *
-from tests.test_validators import *
+from .test_fields import *
+from .test_serializers import *
+from .test_validators import *
+from .test_views import *
+from .test_views_mixin import *
+from .test_views_pagination import *
 
-__all__ = (
-    # test fields
-    BaseFieldTestCase, CharFieldTest, TestIntegerField, TestFloatField, TestBooleanField,
-    TestListField,
-
-    # test serializers
-    BaseSerializerTestClass, SerializerTestClass, SerializerUserTestCase, SerializerSingleMixinTestCase,
-    SerializerManyMixinTestCase, SerializerRequiredMixinTestCase,
-)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/serializers_for_tests.py b/tests/serializers_for_tests.py
@@ -95,3 +95,19 @@ class InheritSecondLevelChild(InheritFirstLevelChild):
 
     """
     second_level_child = IntegerField(required=True)
+
+
+class SerializerSourceFields(Serializer):
+    """
+    Serializer for check source argument.
+
+    """
+    source_field = CharField(source='source', required=True)
+
+
+class SourceFieldFromSerializer(Serializer):
+    """
+    Serializer for check source argument.
+
+    """
+    source_field_serializer = SerializerSourceFields(source='source_field', required=True)
diff --git a/tests/test_serializers.py b/tests/test_serializers.py
@@ -13,16 +13,12 @@
 
 import six
 
-from rest_framework.serializers.fields import (
-    CharField, BooleanField, IntegerField, FloatField, ListField
-)
 from rest_framework.serializers.serializers import BaseSerializer, Serializer, ListSerializer
-from rest_framework.exceptions import SkipError
 from rest_framework.serializers.exceptions import ValidationError
 
 from tests.serializers_for_tests import (
     SerializerPrimitiveField, SerializerMixinSingle, SerializerMixinMany, SerializerMixinRequired,
-    InheritSecondLevelChild
+    InheritSecondLevelChild, SerializerSourceFields, SourceFieldFromSerializer
 )
 
 
diff --git a/tests/test_views_mixin.py b/tests/test_views_mixin.py
@@ -123,8 +123,11 @@ class ForTest(ForTests, GetResponseMixin):
         except AttributeError:
             pass
 
+        def get_response(data, status, content_type='application/json'):
+            return Response(data, status, content_type)
+
         class ForTest(ForTests, GetResponseMixin):
-            response_class = Response
+            response_class = get_response
 
         mixin = ForTest()
 
@@ -141,8 +144,11 @@ class ForTest(ForTests, GetResponseMixin):
         except AttributeError:
             pass
 
+        def get_response(data, status, content_type='application/json'):
+            return Response(data, status, content_type)
+
         class ForTest(ForTests, GetResponseMixin):
-            response_class = Response
+            response_class = get_response
             pagination_class = LimitOffsetObjectsPaginator
 
         mixin = ForTest()
