innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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:
Jacob Kaplan-Moss 2009-12-16 23:47:30 +00:00
parent b38e678dae
commit c0c6e7d103
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
django/core/management/commands/dumpdata.py
View File

@ -137,10 +137,15 @@ def sort_dependencies(app_list):
changed = False changed = False
while model_dependencies: while model_dependencies:
model, deps = model_dependencies.pop() 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 # If all of the models in the dependency list are either already
# on the final model list, or not on the original serialization list, # on the final model list, or not on the original serialization list,
# then we've found another model with all it's dependencies satisfied. # 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) model_list.append(model)
changed = True changed = True
else: else:
@ -152,4 +157,4 @@ def sort_dependencies(app_list):
) )
model_dependencies = skipped model_dependencies = skipped
return model_list return model_list