test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Used field.clone() where applicable

This commit is contained in:
Markus Holtermann 2015-06-26 15:05:55 +02:00
parent ec4f219ecb
commit 736fb1838c
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
django/db/migrations/state.py
View File

@ -357,10 +357,9 @@ class ModelState(object):
continue continue
if isinstance(field, OrderWrt): if isinstance(field, OrderWrt):
continue continue
name, path, args, kwargs = field.deconstruct() name = force_text(field.name, strings_only=True)
field_class = import_string(path)
try: try:
fields.append((name, field_class(*args, **kwargs))) fields.append((name, field.clone()))
except TypeError as e: except TypeError as e:
raise TypeError("Couldn't reconstruct field %s on %s: %s" % ( raise TypeError("Couldn't reconstruct field %s on %s: %s" % (
name, name,
@ -369,10 +368,9 @@ class ModelState(object):
)) ))
if not exclude_rels: if not exclude_rels:
for field in model._meta.local_many_to_many: for field in model._meta.local_many_to_many:
name, path, args, kwargs = field.deconstruct() name = force_text(field.name, strings_only=True)
field_class = import_string(path)
try: try:
fields.append((name, field_class(*args, **kwargs))) fields.append((name, field.clone()))
except TypeError as e: except TypeError as e:
raise TypeError("Couldn't reconstruct m2m field %s on %s: %s" % ( raise TypeError("Couldn't reconstruct m2m field %s on %s: %s" % (
name, name,
@ -499,13 +497,6 @@ class ModelState(object):
} }
return value return value
def construct_fields(self):
"Deep-clone the fields using deconstruction"
for name, field in self.fields:
_, path, args, kwargs = field.deconstruct()
field_class = import_string(path)
yield name, field_class(*args, **kwargs)
def construct_managers(self): def construct_managers(self):
"Deep-clone the managers using deconstruction" "Deep-clone the managers using deconstruction"
# Sort all managers by their creation counter # Sort all managers by their creation counter
@ -546,7 +537,7 @@ class ModelState(object):
except LookupError: except LookupError:
raise InvalidBasesError("Cannot resolve one or more bases from %r" % (self.bases,)) raise InvalidBasesError("Cannot resolve one or more bases from %r" % (self.bases,))
# Turn fields into a dict for the body, add other bits # Turn fields into a dict for the body, add other bits
body = dict(self.construct_fields()) body = {name: field.clone() for name, field in self.fields}
body['Meta'] = meta body['Meta'] = meta
body['__module__'] = "__fake__" body['__module__'] = "__fake__"