Browse files

Modified the internal dumpdata implementation to return the dumped da…

…ta, rather than just printing to screen.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 9f0c545 commit 9afc51bbcb28f89a621553176af191f5db548732 @freakboy3742 freakboy3742 committed Mar 13, 2007
Showing with 3 additions and 3 deletions.
  1. +2 −2 django/core/
  2. +1 −1 tests/modeltests/fixtures/
@@ -1436,7 +1436,7 @@ def dump_data(app_labels, format='json', indent=None):
for model in get_models(app):
- print serializers.serialize(format, objects, indent=indent)
+ return serializers.serialize(format, objects, indent=indent)
except Exception, e:
sys.stderr.write(style.ERROR("Unable to serialize database: %s\n" % e))
dump_data.help_doc = 'Output the contents of the database as a fixture of the given format'
@@ -1582,7 +1582,7 @@ def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING, argv=None):
elif action == 'dumpdata':
- action_mapping[action](args[1:], options.format, options.indent)
+ print action_mapping[action](args[1:], options.format, options.indent)
except IndexError:
elif action in ('startapp', 'startproject'):
@@ -73,7 +73,7 @@ class Meta:
[<Article: Time to reform copyright>, <Article: Poker has no place on ESPN>, <Article: Python program becomes self aware>]
# Dump the current contents of the database as a JSON fixture
->>> management.dump_data(['fixtures'], format='json')
+>>> print management.dump_data(['fixtures'], format='json')
[{"pk": "3", "model": "fixtures.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00"}}, {"pk": "2", "model": "fixtures.article", "fields": {"headline": "Poker has no place on ESPN", "pub_date": "2006-06-16 12:00:00"}}, {"pk": "1", "model": "fixtures.article", "fields": {"headline": "Python program becomes self aware", "pub_date": "2006-06-16 11:00:00"}}]

0 comments on commit 9afc51b

Please sign in to comment.