summaryrefslogtreecommitdiff
path: root/django/apps
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-09-16 09:10:59 -0400
committerTim Graham <timograham@gmail.com>2015-09-17 10:06:52 -0400
commit7506616f164a0e2a63fd8bf5ca044ddb78f9b22a (patch)
tree248a512d3d72ed85fc9706975a896bcf17eaf3f7 /django/apps
parentda5747f8e460ea2a2d16f124463b3975ccfc0992 (diff)
Refs #24215 -- Fixed Python 3.5 compatiblity for unhandled lazy ops error.
Diffstat (limited to 'django/apps')
-rw-r--r--django/apps/registry.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/apps/registry.py b/django/apps/registry.py
index 46c10ef4fb..3484d87aee 100644
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@@ -381,6 +381,10 @@ class Apps(object):
def function(model):
next_function = partial(supplied_fn, model)
+ # Annotate the function with its field for retrieval in
+ # migrations.state.StateApps.
+ if getattr(supplied_fn, 'keywords', None):
+ next_function.field = supplied_fn.keywords.get('field')
self.lazy_model_operation(next_function, *more_models)
# If the model is already loaded, pass it to the function immediately.