Fixed #7436 -- Corrected a fix from [7615] that broke some test cases. Don't you just love unintended consequences? Thanks to telenieko for the report, and the buildbot for pointing out my mistake.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7629 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 4 deletions

diff --git a/django/core/management/commands/dumpdata.py b/django/core/management/commands/dumpdata.py
index 29f9f5fe63..2559d57104 100644
--- a/django/core/management/commands/dumpdata.py
+++ b/django/core/management/commands/dumpdata.py
@@ -18,10 +18,10 @@ class Command(BaseCommand):
     def handle(self, *app_labels, **options):
         from django.db.models import get_app, get_apps, get_models
 
-        format = options['format']
-        indent = options['indent']
-        exclude = options['exclude']
-        show_traceback = options['traceback']
+        format = options.get('format','json')
+        indent = options.get('indent',None)
+        exclude = options.get('exclude',[])
+        show_traceback = options.get('traceback', False)
 
         excluded_apps = [get_app(app_label) for app_label in exclude]