From 6d5a2f2e72f1d0444897b837f25ceb3b9ec48547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Garc=C3=ADa?= Date: Mon, 17 Oct 2016 14:44:56 +0200 Subject: [PATCH 1/2] Update utils.py --- analytics/utils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/analytics/utils.py b/analytics/utils.py index 6840f359..c6abaefe 100644 --- a/analytics/utils.py +++ b/analytics/utils.py @@ -1,5 +1,6 @@ from dateutil.tz import tzlocal, tzutc from datetime import datetime +from datetime import date from decimal import Decimal import logging import numbers @@ -40,6 +41,8 @@ def clean(item): elif isinstance(item, (six.string_types, bool, numbers.Number, datetime, type(None))): return item + elif isinstance(item, date): + return datetime.combine(item, datetime.min.time()) elif isinstance(item, (set, list, tuple)): return _clean_list(item) elif isinstance(item, dict): From 880b6a159a2884868fb4a48db38e6fd085218802 Mon Sep 17 00:00:00 2001 From: Miguel Garcia Rodriguez Date: Mon, 17 Oct 2016 14:58:14 +0200 Subject: [PATCH 2/2] Updated tests for date objects conversion --- analytics/test/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/analytics/test/utils.py b/analytics/test/utils.py index 30eb0bad..cb2d61f4 100644 --- a/analytics/test/utils.py +++ b/analytics/test/utils.py @@ -1,4 +1,4 @@ -from datetime import datetime, timedelta +from datetime import datetime, timedelta, date from decimal import Decimal import unittest @@ -26,7 +26,8 @@ def test_clean(self): simple = { 'decimal': Decimal('0.142857'), 'unicode': six.u('woo'), - 'date': datetime.now(), + 'datetime': datetime.now(), + 'date': date.today(), 'long': 200000000, 'integer': 1, 'float': 2.0,