New deseriailizer for date<iso_8601>

matt · matt · commit 86c3ef06f9ce · 2016-01-12T12:19:57.000-08:00
diff --git a/tests/unit/rest/test_deserialize.py b/tests/unit/rest/test_deserialize.py
@@ -7,6 +7,18 @@
 from twilio import deserialize
 
 
+class Iso8601DateTestCase(unittest.TestCase):
+
+    def test_parsable(self):
+        actual = deserialize.iso8601_date('2015-01-02')
+        expected = datetime.date(2015, 1, 2)
+        self.assertEqual(expected, actual)
+
+    def test_not_parsable(self):
+        actual = deserialize.iso8601_date('not-a-date')
+        self.assertEqual('not-a-date', actual)
+
+
 class Iso8601DateTimeTestCase(unittest.TestCase):
 
     def test_parsable(self):
@@ -15,8 +27,8 @@ def test_parsable(self):
         self.assertEqual(expected, actual)
 
     def test_not_parsable(self):
-        actual = deserialize.iso8601_datetime('not-a-date')
-        self.assertEqual('not-a-date', actual)
+        actual = deserialize.iso8601_datetime('not-a-datetime')
+        self.assertEqual('not-a-datetime', actual)
 
 
 class DecimalTestCase(unittest.TestCase):
diff --git a/twilio/deserialize.py b/twilio/deserialize.py
@@ -3,17 +3,32 @@
 from email.utils import parsedate
 import pytz
 
+ISO8601_DATE_FORMAT = '%Y-%m-%d'
+ISO8601_DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
+
+
+def iso8601_date(s):
+    """
+    Parses an ISO 8601 date string and returns a UTC date object or the string
+    if the parsing failed.
+    :param s: ISO 8601-formatted date string (2015-01-25)
+    :return:
+    """
+    try:
+        return datetime.datetime.strptime(s, ISO8601_DATE_FORMAT).replace(tzinfo=pytz.utc).date()
+    except ValueError:
+        return s
+
 
 def iso8601_datetime(s):
     """
-    Parses an ISO 8601 date string and returns a UTC datetime object,
+    Parses an ISO 8601 datetime string and returns a UTC datetime object,
     or the string if parsing failed.
-    :param s: ISO 8601-formatted string date
+    :param s: ISO 8601-formatted datetime string (2015-01-25T12:34:56Z)
     :return: datetime or str
     """
-    format = "%Y-%m-%dT%H:%M:%SZ"
     try:
-        return datetime.datetime.strptime(s, format).replace(tzinfo=pytz.utc)
+        return datetime.datetime.strptime(s, ISO8601_DATETIME_FORMAT).replace(tzinfo=pytz.utc)
     except ValueError:
         return s
 
