Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #2460 -- JSON serializer now correctly handles datetime objects…

…. Thanks, siniy and jyrki.pulliainen@gmail.com.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2e598fb5718123a98d23638450496ec5a9e54205 1 parent f6fbdf5
Jacob Kaplan-Moss jacobian authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/core/serializers/json.py
6 django/core/serializers/json.py
View
@@ -41,11 +41,11 @@ class DateTimeAwareJSONEncoder(simplejson.JSONEncoder):
TIME_FORMAT = "%H:%M:%S"
def default(self, o):
- if isinstance(o, datetime.date):
+ if isinstance(o, datetime.datetime):
+ return o.strftime("%s %s" % (self.DATE_FORMAT, self.TIME_FORMAT))
+ elif isinstance(o, datetime.date):
return o.strftime(self.DATE_FORMAT)
elif isinstance(o, datetime.time):
return o.strftime(self.TIME_FORMAT)
- elif isinstance(o, datetime.datetime):
- return o.strftime("%s %s" % (self.DATE_FORMAT, self.TIME_FORMAT))
else:
return super(self, DateTimeAwareJSONEncoder).default(o)
Please sign in to comment.
Something went wrong with that request. Please try again.