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

[1.7.x] Renamed variables to avoid name collision with import of django.db.models. 

Backport of 013c2d8d02 from master
This commit is contained in:
Russell Keith-Magee 2014-12-31 13:21:32 +08:00 committed by Tim Graham
parent 9311a94ca5
commit f1a22feaa8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/db/migrations/autodetector.py
View File

@ -457,11 +457,11 @@ class MigrationAutodetector(object):
old_keys = set(self.old_model_keys).union(self.old_unmanaged_keys) old_keys = set(self.old_model_keys).union(self.old_unmanaged_keys)
added_models = set(self.new_model_keys) - old_keys added_models = set(self.new_model_keys) - old_keys
added_unmanaged_models = set(self.new_unmanaged_keys) - old_keys added_unmanaged_models = set(self.new_unmanaged_keys) - old_keys
models = chain( all_added_models = chain(
sorted(added_models, key=self.swappable_first_key, reverse=True), sorted(added_models, key=self.swappable_first_key, reverse=True),
sorted(added_unmanaged_models, key=self.swappable_first_key, reverse=True) sorted(added_unmanaged_models, key=self.swappable_first_key, reverse=True)
) )
for app_label, model_name in models: for app_label, model_name in all_added_models:
model_state = self.to_state.models[app_label, model_name] model_state = self.to_state.models[app_label, model_name]
model_opts = self.new_apps.get_model(app_label, model_name)._meta model_opts = self.new_apps.get_model(app_label, model_name)._meta
# Gather related fields # Gather related fields
@ -634,8 +634,8 @@ class MigrationAutodetector(object):
new_keys = set(self.new_model_keys).union(self.new_unmanaged_keys) new_keys = set(self.new_model_keys).union(self.new_unmanaged_keys)
deleted_models = set(self.old_model_keys) - new_keys deleted_models = set(self.old_model_keys) - new_keys
deleted_unmanaged_models = set(self.old_unmanaged_keys) - new_keys deleted_unmanaged_models = set(self.old_unmanaged_keys) - new_keys
models = chain(sorted(deleted_models), sorted(deleted_unmanaged_models)) all_deleted_models = chain(sorted(deleted_models), sorted(deleted_unmanaged_models))
for app_label, model_name in models: for app_label, model_name in all_deleted_models:
model_state = self.from_state.models[app_label, model_name] model_state = self.from_state.models[app_label, model_name]
model = self.old_apps.get_model(app_label, model_name) model = self.old_apps.get_model(app_label, model_name)
if not model._meta.managed: if not model._meta.managed: