aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorTom Christie2015-02-17 10:58:00 +0000
committerTom Christie2015-02-17 10:58:00 +0000
commitdbd23521656b366cbaa1382a0d222f8fe4e3a326 (patch)
tree8fc86473ecc5097909250e0a9d5d440baabaf403 /rest_framework/serializers.py
parent76fe710c0d81cbf21f246de6026e7360179ea053 (diff)
downloaddjango-rest-framework-dbd23521656b366cbaa1382a0d222f8fe4e3a326.tar.bz2
Fixes for latest pep8 updates. Refs #2563.
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index c60574d4..9475e119 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -336,8 +336,8 @@ class Serializer(BaseSerializer):
return OrderedDict([
(field_name, field.get_value(self.initial_data))
for field_name, field in self.fields.items()
- if field.get_value(self.initial_data) is not empty
- and not field.read_only
+ if (field.get_value(self.initial_data) is not empty) and
+ not field.read_only
])
return OrderedDict([
@@ -653,8 +653,9 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data):
# ...
# profile = ProfileSerializer()
assert not any(
- isinstance(field, BaseSerializer) and (key in validated_data)
- and isinstance(validated_data[key], (list, dict))
+ isinstance(field, BaseSerializer) and
+ (key in validated_data) and
+ isinstance(validated_data[key], (list, dict))
for key, field in serializer.fields.items()
), (
'The `.{method_name}()` method does not support writable nested'
@@ -673,8 +674,9 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data):
# ...
# address = serializer.CharField('profile.address')
assert not any(
- '.' in field.source and (key in validated_data)
- and isinstance(validated_data[key], (list, dict))
+ '.' in field.source and
+ (key in validated_data) and
+ isinstance(validated_data[key], (list, dict))
for key, field in serializer.fields.items()
), (
'The `.{method_name}()` method does not support writable dotted-source '