diff options
| -rw-r--r-- | django/core/management.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/django/core/management.py b/django/core/management.py index 0a04a7e830..21d867f2c5 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -1354,13 +1354,14 @@ def load_data(fixture_labels, verbosity=1): for fixture_dir in app_fixtures + list(settings.FIXTURE_DIRS) + ['']: if verbosity > 1: print "Checking %s for fixtures..." % humanize(fixture_dir) - try: - fixture_name, format = fixture_label.rsplit('.', 1) - formats = [format] - except ValueError: + 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 for format in formats: serializer = serializers.get_serializer(format) |