ok so imports were being referred wrongly so made datetime.datetime be just datetime and datetime.date be just date

This commit is contained in:
Alfredo Deza
2010-11-18 12:17:27 -05:00
parent 06abd92951
commit 98ef40daf8

View File

@@ -3,7 +3,8 @@ try:
except ImportError:
from simplejson import JSONEncoder
from datetime import datetime
from datetime import datetime, date
from decimal import Decimal
from webob.multidict import MultiDict
from simplegeneric import generic
@@ -27,9 +28,9 @@ class GenericJSON(JSONEncoder):
def default(self, obj):
if hasattr(obj, '__json__') and callable(obj.__json__):
return obj.__json__()
elif isinstance(obj, (datetime.date, datetime.datetime)):
elif isinstance(obj, (date, datetime)):
return str(obj)
elif isinstance(obj, decimal.Decimal):
elif isinstance(obj, Decimal):
return float(obj)
elif is_saobject(obj):
props = {}