diff options
| author | Kevin Kubasik <kevin@kubasik.net> | 2009-08-04 09:30:09 +0000 |
|---|---|---|
| committer | Kevin Kubasik <kevin@kubasik.net> | 2009-08-04 09:30:09 +0000 |
| commit | e2d14c075a51eb1f0b832765df8723d82f0afac4 (patch) | |
| tree | ca4e9e95cb45d9275f6272b8ca1bab7f06e5eeff /django/core/management/commands/dumpdata.py | |
| parent | f0a864b482cb3aad69424e33a7e259ddb831ea5f (diff) | |
| parent | cb5e5dc2bc232905c03deea6bc453a2e9a2338f1 (diff) | |
[gsoc2009-testing] Massive merge update to trunk. This is in preparation for the release of a sample app and tests
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/test-improvements@11385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core/management/commands/dumpdata.py')
| -rw-r--r-- | django/core/management/commands/dumpdata.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/management/commands/dumpdata.py b/django/core/management/commands/dumpdata.py index 9172d938d2..7e05b89160 100644 --- a/django/core/management/commands/dumpdata.py +++ b/django/core/management/commands/dumpdata.py @@ -73,7 +73,8 @@ class Command(BaseCommand): model_list = get_models(app) for model in model_list: - objects.extend(model._default_manager.all()) + if not model._meta.proxy: + objects.extend(model._default_manager.all()) try: return serializers.serialize(format, objects, indent=indent) |