Django

Code

Changeset 4715

Show
Ignore:
Timestamp:
03/12/07 19:29:21 (2 years ago)
Author:
russellm
Message:

Modified the internal dumpdata implementation to return the dumped data, rather than just printing to screen.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/management.py

    r4671 r4715  
    14371437            objects.extend(model.objects.all()) 
    14381438    try: 
    1439         print serializers.serialize(format, objects, indent=indent) 
     1439        return serializers.serialize(format, objects, indent=indent) 
    14401440    except Exception, e: 
    14411441        sys.stderr.write(style.ERROR("Unable to serialize database: %s\n" % e)) 
    …… 
    15831583    elif action == 'dumpdata': 
    15841584        try: 
    1585             action_mapping[action](args[1:], options.format, options.indent) 
     1585            print action_mapping[action](args[1:], options.format, options.indent) 
    15861586        except IndexError: 
    15871587            parser.print_usage_and_exit() 

  • django/trunk/tests/modeltests/fixtures/models.py

    r4659 r4715  
    7474 
    7575# Dump the current contents of the database as a JSON fixture 
    76 >>> management.dump_data(['fixtures'], format='json') 
     76>>> print management.dump_data(['fixtures'], format='json') 
    7777[{"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"}}] 
    7878"""}