Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 5003df3659f8f6d32f60bab8c409a1159cc956a1 1 parent b5d9ad9
Ramiro Morales ramiro authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 django/core/serializers/json.py
4 django/core/serializers/json.py
View
@@ -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):
Please sign in to comment.
Something went wrong with that request. Please try again.