mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #26125 -- Fixed E731 flake warnings.

Browse Source
This commit is contained in:
userimack
2016-01-23 22:17:07 +05:30
committed by Tim Graham
parent abc0777b63
commit 60586dd737
36 changed files with 176 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
django/core/serializers/python.py
View File

@@ -70,9 +70,11 @@ class Serializer(base.Serializer):
def handle_m2m_field(self, obj, field):
if field.remote_field.through._meta.auto_created:
if self.use_natural_foreign_keys and hasattr(field.remote_field.model, 'natural_key'):
m2m_value = lambda value: value.natural_key()
def m2m_value(value):
return value.natural_key()
else:
m2m_value = lambda value: force_text(value._get_pk_val(), strings_only=True)
def m2m_value(value):
return force_text(value._get_pk_val(), strings_only=True)
self._current[field.name] = [m2m_value(related)
for related in getattr(obj, field.name).iterator()]
@@ -136,7 +138,8 @@ def Deserializer(object_list, **options):
else:
return force_text(model._meta.pk.to_python(value), strings_only=True)
else:
m2m_convert = lambda v: force_text(model._meta.pk.to_python(v), strings_only=True)
def m2m_convert(v):
return force_text(model._meta.pk.to_python(v), strings_only=True)
try:
m2m_data[field.name] = []

3
django/core/serializers/xml_serializer.py
View File

@@ -275,7 +275,8 @@ class Deserializer(base.Deserializer):
obj_pk = model._meta.pk.to_python(n.getAttribute('pk'))
return obj_pk
else:
m2m_convert = lambda n: model._meta.pk.to_python(n.getAttribute('pk'))
def m2m_convert(n):
return model._meta.pk.to_python(n.getAttribute('pk'))
return [m2m_convert(c) for c in node.getElementsByTagName("object")]
def _get_model_from_node(self, node, attr):