fix issue related to ISO-8601 datetime string

- #83
- it seems the isoformat provided by python has ‘microsecond’ field.

Author: mission-liao

pyswagger/tests/test_utils.py

@@ -17,7 +17,13 @@ def test_iso8601_convert_from_string(self):
         self.assertEqual(utils.from_iso8601('2007-04-05T12:30:00-02:00'), datetime(2007, 4, 5, 14, 30, tzinfo=utils.FixedTZ(0, 0)))
         self.assertEqual(utils.from_iso8601('2007-04-05T00:00:00'), datetime(2007, 4, 5, 0, 0, 0))
         self.assertEqual(utils.from_iso8601('2007-04-05T00:00:00Z'), datetime(2007, 4, 5, 0, 0, 0, tzinfo=utils.FixedTZ(0, 0)))
-
+        # microsecond
+        self.assertEqual(utils.from_iso8601('2007-04-05T14:30:24.1'), datetime(2007, 4, 5, 14, 30, 24, 100000))
+        self.assertEqual(utils.from_iso8601('2007-04-05T14:30:24.11'), datetime(2007, 4, 5, 14, 30, 24, 110000))
+        self.assertEqual(utils.from_iso8601('2007-04-05T14:30:24.111'), datetime(2007, 4, 5, 14, 30, 24, 111000))
+        self.assertEqual(utils.from_iso8601('2007-04-05T14:30:24.1111'), datetime(2007, 4, 5, 14, 30, 24, 111100))
+        self.assertEqual(utils.from_iso8601('2007-04-05T14:30:24.11111'), datetime(2007, 4, 5, 14, 30, 24, 111110))
+        self.assertEqual(utils.from_iso8601('2007-04-05T14:30:24.111111'), datetime(2007, 4, 5, 14, 30, 24, 111111))
 
     def test_json_pointer(self):
         """ json pointer io function """

pyswagger/utils.py

@@ -119,7 +119,7 @@ def dst(self, dt):
 _iso8601_fmt = re.compile(''.join([
     '(?P<year>\d{4})-(?P<month>\d{2})-(?P<day>\d{2})', # YYYY-MM-DD
     'T', # T
-    '(?P<hour>\d{2}):(?P<minute>\d{2})(:(?P<second>\d{1,2}))?', # hh:mm:ss
+    '(?P<hour>\d{2}):(?P<minute>\d{2})(:(?P<second>\d{1,2})(\.(?P<microsecond>\d{1,6}))?)?', # hh:mm:ss.ms
     '(?P<tz>Z|[+-]\d{2}:\d{2})?' # Z or +/-hh:mm
 ]))
 _iso8601_fmt_date = re.compile('(?P<year>\d{4})-(?P<month>\d{2})-(?P<day>\d{2})') # YYYY-MM-DD
@@ -155,6 +155,10 @@ def _default_none(key):
     hour = _default_none('hour')
     minute = _default_none('minute')
     second = _default_none('second')
+    microsecond = g.get('microsecond', None)
+    if microsecond is not None:
+        # append zero when not matching 6 digits
+        microsecond = int(microsecond + '0' * (6 - len(microsecond)))
     tz_s = g.get('tz')
 
     if not (year and month and day):
@@ -186,6 +190,7 @@ def _default_none(key):
         hour=hour or 0,
         minute=minute or 0,
         second=second or 0,
+        microsecond=microsecond or 0,
         tzinfo=tz
     )