Changeset 4829

Timestamp:

03/27/07 06:11:03 (2 years ago)

Author:

russellm

Message:

Improved error reporting when fixture files are provided in an unknown serialization format.

Files:

• django/trunk/django/core/management.py (modified) (1 diff)

django/trunk/django/core/management.py

@@ -1356 +1356 @@
-    app_fixtures = [os.path.join(os.path.dirname(app.__file__),'fixtures') for app in get_apps()]
-    for fixture_label in fixture_labels:
+        parts = fixture_label.split('.')
+        if len(parts) == 1:
+            fixture_name = fixture_label
+            formats = serializers.get_serializer_formats()
+        else:
+            fixture_name, format = '.'.join(parts[:-1]), parts[-1]
+            if format in serializers.get_serializer_formats():
+                formats = [format]
+            else:
+                formats = []
+                
-        if verbosity > 0:
-
+
+
+
+
+
-        for fixture_dir in app_fixtures + list(settings.FIXTURE_DIRS) + ['']:
-            if verbosity > 1:
-                print "Checking %s for fixtures..." % humanize(fixture_dir)
-            parts = fixture_label.split('.')
-            if len(parts) == 1:
-                fixture_name = fixture_label
-                formats = serializers.get_serializer_formats()
-            else:
-                fixture_name, format = '.'.join(parts[:-1]), parts[-1]
-                formats = [format]
-
-            label_found = False