Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Date objects fail json serialization #92

Merged
merged 1 commit into from
Jan 25, 2017
Merged

Date objects fail json serialization #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions analytics/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import date, datetime
from dateutil.tz import tzutc
import logging
import json
Expand Down Expand Up @@ -47,7 +47,7 @@ def __str__(self):

class DatetimeSerializer(json.JSONEncoder):
def default(self, obj):
if isinstance(obj, datetime):
if isinstance(obj, (date, datetime)):
return obj.isoformat()

return json.JSONEncoder.default(self, obj)
9 changes: 8 additions & 1 deletion analytics/test/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, date
import unittest
import json

Expand All @@ -22,3 +22,10 @@ def test_datetime_serialization(self):
data = { 'created': datetime(2012, 3, 4, 5, 6, 7, 891011) }
result = json.dumps(data, cls=DatetimeSerializer)
self.assertEqual(result, '{"created": "2012-03-04T05:06:07.891011"}')

def test_date_serialization(self):
today = date.today()
data = {'created': today}
result = json.dumps(data, cls=DatetimeSerializer)
expected = '{"created": "%s"}' % today.isoformat()
self.assertEqual(result, expected)