p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tweaked changes from r17228 to cater for older simplejson versions. 

dump() started accepting the `use_decimal` argument in 2.1.3.

Refs #16850.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2011-12-17 23:00:41 +00:00
parent b5d9ad982d
commit 5003df3659
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/serializers/json.py
View File

@ -18,7 +18,9 @@ class Serializer(PythonSerializer):
internal_use_only = False
def end_serialization(self):
self.options.update({'use_decimal': False}) # Use JS strings to represent Python Decimal instances (ticket #16850)
if simplejson.__version__.split('.') >= ['2', '1', '3']:
# Use JS strings to represent Python Decimal instances (ticket #16850)
self.options.update({'use_decimal': False})
simplejson.dump(self.objects, self.stream, cls=DjangoJSONEncoder, **self.options)
def getvalue(self):