Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit c0c6e7d1031b5e8c8824ec5068ac46e48c2f67e4 1 parent b38e678
Jacob Kaplan-Moss jacobian authored
Showing with 10 additions and 5 deletions.
  1. +10 −5 django/core/management/commands/dumpdata.py
15 django/core/management/commands/dumpdata.py
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.