0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix dates < 1900

Browse source
This commit is contained in:
j 2013-06-28 14:57:31 +00:00
parent f7e9605828
commit 1e65f3e478
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ox/django/fields.py
View file

@ -4,11 +4,17 @@ import time
import datetime import datetime
from django.db import models from django.db import models
from django.utils import datetime_safe
from ox.utils import json from ox.utils import json
def to_json(python_object): def to_json(python_object):
if isinstance(python_object, datetime.datetime): if isinstance(python_object, datetime.datetime):
value = datetime_safe.datetime.fromordinal(python_object.toordinal())
return {'__class__': 'datetime.datetime',
'__value__': value.strftime('%Y-%m-%dT%H:%M:%SZ')}
if isinstance(python_object, datetime_safe.datetime):
return {'__class__': 'datetime.datetime', return {'__class__': 'datetime.datetime',
'__value__': python_object.strftime('%Y-%m-%dT%H:%M:%SZ')} '__value__': python_object.strftime('%Y-%m-%dT%H:%M:%SZ')}
if isinstance(python_object, time.struct_time): if isinstance(python_object, time.struct_time):
@ -26,8 +32,9 @@ def from_json(json_object):
if '__class__' in json_object: if '__class__' in json_object:
if json_object['__class__'] == 'bytes': if json_object['__class__'] == 'bytes':
return bytes(json_object['__value__']) return bytes(json_object['__value__'])
if json_object['__class__'] == 'datetime.datetime': if json_object['__class__'] == 'datetime_safe.datetime' \
return datetime.datetime.strptime(json_object['__value__'], '%Y-%m-%dT%H:%M:%SZ') or json_object['__class__'] == 'datetime.datetime':
return datetime_safe.datetime.strptime(json_object['__value__'], '%Y-%m-%dT%H:%M:%SZ')
if json_object['__class__'] == 'time.asctime': if json_object['__class__'] == 'time.asctime':
return time.strptime(json_object['__value__']) return time.strptime(json_object['__value__'])
return json_object return json_object

4
ox/django/shortcuts.py
View file

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
import datetime import datetime
from django.utils import datetime_safe
from django.http import HttpResponse, Http404 from django.http import HttpResponse, Http404
try: try:
import simplejson as json import simplejson as json
@ -19,6 +20,9 @@ def json_response(data=None, status=200, text='ok'):
def _to_json(python_object): def _to_json(python_object):
if isinstance(python_object, datetime.datetime): if isinstance(python_object, datetime.datetime):
value = datetime_safe.datetime.fromordinal(python_object.toordinal())
return value.strftime('%Y-%m-%dT%H:%M:%SZ')
if isinstance(python_object, datetime_safe.datetime):
return python_object.strftime('%Y-%m-%dT%H:%M:%SZ') return python_object.strftime('%Y-%m-%dT%H:%M:%SZ')
raise TypeError(u'%s %s is not JSON serializable' % (repr(python_object), type(python_object))) raise TypeError(u'%s %s is not JSON serializable' % (repr(python_object), type(python_object)))