summaryrefslogtreecommitdiff
path: root/django/core/serializers/json.py
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2011-01-08 15:07:45 +0000
committerAndrew Godwin <andrew@aeracode.org>2011-01-08 15:07:45 +0000
commit614672d365d6761353dbd11a8967a254d97035b7 (patch)
tree846fa79a4c3941df9f21bb15d15787871e9ca156 /django/core/serializers/json.py
parent1ad644c0f052a60903ed0b94defe0c04fca47d06 (diff)
downloaddjango-614672d365d6761353dbd11a8967a254d97035b7.tar.gz
Fixed #14888 -- Removing duplicated code in serialisers. Thanks to eric.fortin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core/serializers/json.py')
-rw-r--r--django/core/serializers/json.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py
index b82c0a0ec7..b8119f54d4 100644
--- a/django/core/serializers/json.py
+++ b/django/core/serializers/json.py
@@ -18,9 +18,6 @@ class Serializer(PythonSerializer):
internal_use_only = False
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):