mirror of
https://github.com/django/django.git
synced 2024-12-23 09:36:06 +00:00
Fixed #12384: fixed a Python 2.4 incompatibility introduced in [11863].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
b38e678dae
commit
c0c6e7d103
@ -137,10 +137,15 @@ def sort_dependencies(app_list):
|
||||
changed = False
|
||||
while model_dependencies:
|
||||
model, deps = model_dependencies.pop()
|
||||
if all((d not in models or d in model_list) for d in deps):
|
||||
# If all of the models in the dependency list are either already
|
||||
# on the final model list, or not on the original serialization list,
|
||||
# then we've found another model with all it's dependencies satisfied.
|
||||
|
||||
# If all of the models in the dependency list are either already
|
||||
# on the final model list, or not on the original serialization list,
|
||||
# then we've found another model with all it's dependencies satisfied.
|
||||
found = True
|
||||
for candidate in ((d not in models or d in model_list) for d in deps):
|
||||
if not candidate:
|
||||
found = False
|
||||
if found:
|
||||
model_list.append(model)
|
||||
changed = True
|
||||
else:
|
||||
@ -152,4 +157,4 @@ def sort_dependencies(app_list):
|
||||
)
|
||||
model_dependencies = skipped
|
||||
|
||||
return model_list
|
||||
return model_list
|
Loading…
Reference in New Issue
Block a user