Changeset 5075
- Timestamp:
- 04/25/07 05:12:05 (2 years ago)
- Files:
-
- django/trunk/django/core/serializers/base.py (modified) (1 diff)
- django/trunk/django/core/serializers/json.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/core/serializers/base.py
r4752 r5075 106 106 def getvalue(self): 107 107 """ 108 Return the fully serialized queryset. 108 Return the fully serialized queryset (or None if the output stream is 109 not seekable). 109 110 """ 110 return self.stream.getvalue() 111 if callable(getattr(self.stream, 'getvalue', None)): 112 return self.stream.getvalue() 111 113 112 114 class Deserializer(object): django/trunk/django/core/serializers/json.py
r4265 r5075 18 18 def end_serialization(self): 19 19 simplejson.dump(self.objects, self.stream, cls=DateTimeAwareJSONEncoder, **self.options) 20 20 21 21 def getvalue(self): 22 return self.stream.getvalue() 22 if callable(getattr(self.stream, 'getvalue', None)): 23 return self.stream.getvalue() 23 24 24 25 def Deserializer(stream_or_string, **options): … … 32 33 for obj in PythonDeserializer(simplejson.load(stream)): 33 34 yield obj 34 35 35 36 class DateTimeAwareJSONEncoder(simplejson.JSONEncoder): 36 37 """ 37 38 JSONEncoder subclass that knows how to encode date/time types 38 39 """ 39 40 DATE_FORMAT = "%Y-%m-%d" 40 41 DATE_FORMAT = "%Y-%m-%d" 41 42 TIME_FORMAT = "%H:%M:%S" 42 43 43 44 def default(self, o): 44 45 if isinstance(o, datetime.datetime):
