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

Better error reporting when from_app_cache fails

This commit is contained in:
Andrew Godwin 2013-12-05 14:19:46 +00:00
parent 4ca39684ee
commit e9c6d04224
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,11 +99,25 @@ class ModelState(object):
for field in model._meta.local_fields: for field in model._meta.local_fields:
name, path, args, kwargs = field.deconstruct() name, path, args, kwargs = field.deconstruct()
field_class = import_by_path(path) field_class = import_by_path(path)
fields.append((name, field_class(*args, **kwargs))) try:
fields.append((name, field_class(*args, **kwargs)))
except TypeError as e:
raise TypeError("Couldn't reconstruct field %s on %s: %s" % (
name,
model._meta.object_name,
e,
))
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, path, args, kwargs = field.deconstruct()
field_class = import_by_path(path) field_class = import_by_path(path)
fields.append((name, field_class(*args, **kwargs))) try:
fields.append((name, field_class(*args, **kwargs)))
except TypeError as e:
raise TypeError("Couldn't reconstruct m2m field %s on %s: %s" % (
name,
model._meta.object_name,
e,
))
# Extract the options # Extract the options
options = {} options = {}
for name in DEFAULT_NAMES: for name in DEFAULT_NAMES: