diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2006-07-31 14:59:53 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2006-07-31 14:59:53 +0000 |
| commit | 2e598fb5718123a98d23638450496ec5a9e54205 (patch) | |
| tree | bb7f6c4465f142626f915176aa9296cbdfdc6393 /django | |
| parent | f6fbdf575a4aba0f94e6309571569eb48159f98e (diff) | |
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
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/serializers/json.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py index dd6513db57..a8b4259099 100644 --- a/django/core/serializers/json.py +++ b/django/core/serializers/json.py @@ -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)
\ No newline at end of file |