aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorXavier Ordoquy2014-05-19 07:38:06 +0200
committerXavier Ordoquy2014-05-19 07:38:06 +0200
commitd46d153a9979a96fae643a24286eacaf5c219401 (patch)
tree652c63a634526040060d9fb23552ae4c8ec986ce /rest_framework/serializers.py
parentaf1ee3e63175d2b1fd30ab18091bed1019ac5de6 (diff)
parenta1a3ad763996b9ab5535bc5d442c2d6fab10b7cc (diff)
downloaddjango-rest-framework-d46d153a9979a96fae643a24286eacaf5c219401.tar.bz2
Merge pull request #1589 from the5fire/fix-pep8
fix pep8
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 6dd09f68..87d20cfc 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -33,8 +33,8 @@ from rest_framework.settings import api_settings
# This helps keep the separation between model fields, form fields, and
# serializer fields more explicit.
-from rest_framework.relations import *
-from rest_framework.fields import *
+from rest_framework.relations import * # NOQA
+from rest_framework.fields import * # NOQA
def _resolve_model(obj):
@@ -345,7 +345,7 @@ class BaseSerializer(WritableField):
for field_name, field in self.fields.items():
if field.read_only and obj is None:
- continue
+ continue
field.initialize(parent=self, field_name=field_name)
key = self.get_field_key(field_name)
value = field.field_to_native(obj, field_name)