Django

Code

Changeset 3501

Show
Ignore:
Timestamp:
07/31/06 09:59:53 (2 years ago)
Author:
jacob
Message:

Fixed #2460 -- JSON serializer now correctly handles datetime objects. Thanks, siniy and jyrki.pulliainen@gmail.com.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/serializers/json.py

    r3237 r3501  
    4242     
    4343    def default(self, o): 
    44         if isinstance(o, datetime.date): 
     44        if isinstance(o, datetime.datetime): 
     45            return o.strftime("%s %s" % (self.DATE_FORMAT, self.TIME_FORMAT)) 
     46        elif isinstance(o, datetime.date): 
    4547            return o.strftime(self.DATE_FORMAT) 
    4648        elif isinstance(o, datetime.time): 
    4749            return o.strftime(self.TIME_FORMAT) 
    48         elif isinstance(o, datetime.datetime): 
    49             return o.strftime("%s %s" % (self.DATE_FORMAT, self.TIME_FORMAT)) 
    5050        else: 
    5151            return super(self, DateTimeAwareJSONEncoder).default(o)