Changeset 7948 for django/branches/newforms-admin/django/core/serializers
- Timestamp:
- 07/18/08 10:47:10 (6 months ago)
- Files:
-
- django/branches/newforms-admin (modified) (1 prop)
- django/branches/newforms-admin/django/core/serializers/base.py (modified) (2 diffs)
- django/branches/newforms-admin/django/core/serializers/json.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7943 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7947
django/branches/newforms-admin/django/core/serializers/base.py
r7604 r7948 9 9 from django.db import models 10 10 from django.utils.encoding import smart_str, smart_unicode 11 from django.utils import datetime_safe 11 12 12 13 class SerializationError(Exception): … … 60 61 """ 61 62 if isinstance(field, models.DateTimeField): 62 value = getattr(obj, field.name).strftime("%Y-%m-%d %H:%M:%S") 63 d = datetime_safe.new_datetime(getattr(obj, field.name)) 64 value = d.strftime("%Y-%m-%d %H:%M:%S") 63 65 else: 64 66 value = field.flatten_data(follow=None, obj=obj).get(field.name, "") django/branches/newforms-admin/django/core/serializers/json.py
r7233 r7948 7 7 from django.core.serializers.python import Serializer as PythonSerializer 8 8 from django.core.serializers.python import Deserializer as PythonDeserializer 9 from django.utils import datetime_safe 9 10 try: 10 11 from cStringIO import StringIO … … 21 22 """ 22 23 internal_use_only = False 23 24 24 25 def end_serialization(self): 25 26 self.options.pop('stream', None) … … 52 53 def default(self, o): 53 54 if isinstance(o, datetime.datetime): 54 return o.strftime("%s %s" % (self.DATE_FORMAT, self.TIME_FORMAT)) 55 d = datetime_safe.new_datetime(o) 56 return d.strftime("%s %s" % (self.DATE_FORMAT, self.TIME_FORMAT)) 55 57 elif isinstance(o, datetime.date): 56 return o.strftime(self.DATE_FORMAT) 58 d = datetime_safe.new_date(o) 59 return d.strftime(self.DATE_FORMAT) 57 60 elif isinstance(o, datetime.time): 58 61 return o.strftime(self.TIME_FORMAT)
