Skip to content

Commit 39a09ab

Browse files
author
nxexox
committed
fix source argument in fields
1 parent e1b5358 commit 39a09ab

File tree

8 files changed

+23
-7
lines changed

8 files changed

+23
-7
lines changed

docs/release-notes.md

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ Medium version numbers (0.x.0) may include API changes, in line with the [deprec
88

99
Major version numbers (x.0.0) are reserved for substantial project milestones.
1010

11+
### 0.3.10
12+
13+
**Date:** [17th September 2019]
14+
15+
* Fixed the argument [`source`][SourceFieldAttribute] in serializer fields into method `to_representation`.
16+
1117
### 0.3.9
1218

1319
**Date:** [10th September 2019]

rest_framework/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
__/ |
99
|___/
1010
"""
11-
VERSION = (0, 3, 9)
11+
VERSION = (0, 3, 10)
1212

1313
__title__ = 'Python-Rest-Framework'
1414
__author__ = 'Deys Timofey'

rest_framework/serializers/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from .exceptions import ValidationError
1313

1414

15-
__all__ = (
15+
__ALL__ = (
1616
# fields
1717
BooleanField, BooleanNullField, CharField, IntegerField, FloatField, ListField,
1818
TimeField, DateField, DateTimeField,

rest_framework/serializers/fields.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,16 @@ def _get_field_name(self):
240240
:return: Field name for search attribute.
241241
:rtype: str
242242
243+
"""
244+
return self.field_name
245+
246+
def _get_attribute_name(self):
247+
"""
248+
Get attribute name, for search attribute in object.
249+
250+
:return: Attribute name
251+
:rtype: str
252+
243253
"""
244254
return self.source or self.field_name
245255

@@ -254,7 +264,7 @@ def _get_attribute(self, instance):
254264
:raise Exception: If an error occurred during the search.
255265
256266
"""
257-
return get_attribute(instance, self._get_field_name())
267+
return get_attribute(instance, self._get_attribute_name())
258268

259269
def get_attribute(self, instance):
260270
"""

rest_framework/views/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
BasePaginatorAbstract, LimitOffsetResultPaginator, LimitOffsetObjectsPaginator, LimitOffsetItemsPaginator
77
)
88

9-
__all__ = [
9+
__ALL__ = [
1010
BaseApiView,
1111
GetSerializerMixin, GetResponseMixin,
1212
BasePaginatorAbstract, LimitOffsetResultPaginator, LimitOffsetObjectsPaginator, LimitOffsetItemsPaginator

rest_framework/views/aiohttp/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from .views import AioHTTPApiView, json_response
55
from .generics import GetResponseApiGenericView, GetSerializerApiGenericView, ApiGenericView
66
from .mixins import GetValidJsonMixin
7-
__all__ = [
7+
__ALL__ = [
88
AioHTTPApiView,
99
GetResponseApiGenericView, GetSerializerApiGenericView, ApiGenericView,
1010
GetValidJsonMixin,

rest_framework/views/flask/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
GetSerializerApiGenericMethodView, GetResponseApiGenericMethodView, ApiGenericMethodView
88
)
99
from .mixins import GetValidJsonMixin
10-
__all__ = [
10+
__ALL__ = [
1111
FlaskBaseApiView, FlaskBaseMethodView,
1212
GetResponseApiGenericView, GetSerializerApiGenericView, ApiGenericView,
1313
GetSerializerApiGenericMethodView, GetResponseApiGenericMethodView, ApiGenericMethodView,

rest_framework/views/sanic/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
GetValidJsonApiGenericCompositionView, SanicApiCompositionView
1010
)
1111
from .mixins import GetValidJsonMixin
12-
__all__ = [
12+
__ALL__ = [
1313
SanicApiMethodView, SanicApiCompositionView,
1414

1515
GetResponseApiGenericMethodView, GetSerializerApiGenericMethodView, GetValidJsonApiGenericMethodView,

0 commit comments

Comments
 (0)