diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2009-12-14 12:39:20 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2009-12-14 12:39:20 +0000 |
| commit | 35cc439228cd32dfa7a3ec919db01a8a5cd17d33 (patch) | |
| tree | ed9aff433487895c0e649994450fd0accb6362d2 /django/core/serializers/json.py | |
| parent | 44b9076bbed3e629230d9b77a8765e4c906036d1 (diff) | |
| download | django-35cc439228cd32dfa7a3ec919db01a8a5cd17d33.tar.gz | |
Fixed #7052 -- Added support for natural keys in serialization.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core/serializers/json.py')
| -rw-r--r-- | django/core/serializers/json.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py index 97e5bc9b26..d5872fefc3 100644 --- a/django/core/serializers/json.py +++ b/django/core/serializers/json.py @@ -24,6 +24,7 @@ class Serializer(PythonSerializer): def end_serialization(self): self.options.pop('stream', None) self.options.pop('fields', None) + self.options.pop('use_natural_keys', None) simplejson.dump(self.objects, self.stream, cls=DjangoJSONEncoder, **self.options) def getvalue(self): |