Add support for microsecond on strptime

Author: mariocj89

Lib/_strptime.py

@@ -210,7 +210,7 @@ def __init__(self, locale_time=None):
             #XXX: Does 'Y' need to worry about having less or more than
             #     4 digits?
             'Y': r"(?P<Y>\d\d\d\d)",
-            'z': r"(?P<z>[+-]\d\d:?[0-5]\d(:?[0-5]\d)?|Z)",
+            'z': r"(?P<z>[+-]\d\d:?[0-5]\d(:?[0-5]\d(\.\d{1,6})?)?|Z)",
             'A': self.__seqToRE(self.locale_time.f_weekday, 'A'),
             'a': self.__seqToRE(self.locale_time.a_weekday, 'a'),
             'B': self.__seqToRE(self.locale_time.f_month[1:], 'B'),
@@ -467,7 +467,9 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
                 hours = int(z[1:3])
                 minutes = int(z[3:5])
                 seconds = int(z[5:7] or 0)
+                microseconds = int(z[8:] or 0)
                 gmtoff = (hours * 60 * 60) + (minutes * 60) + seconds
+                gmtoff = gmtoff + (microseconds / (10**6))
                 if z.startswith("-"):
                     gmtoff = -gmtoff
         elif group_key == 'Z':

Lib/test/test_strptime.py

@@ -327,15 +327,31 @@ def test_offset(self):
         self.assertEqual(offset, -one_hour)
         (*_, offset), _ = _strptime._strptime("-013030", "%z")
         self.assertEqual(offset, -(one_hour + half_hour + half_minute))
+        (*_, offset), _ = _strptime._strptime("-013030.000001", "%z")
+        self.assertEqual(offset, -(one_hour + half_hour + half_minute + 0.000001))
         (*_, offset), _ = _strptime._strptime("+01:00", "%z")
         self.assertEqual(offset, one_hour)
         (*_, offset), _ = _strptime._strptime("-01:30", "%z")
         self.assertEqual(offset, -(one_hour + half_hour))
         (*_, offset), _ = _strptime._strptime("-01:30:30", "%z")
         self.assertEqual(offset, -(one_hour + half_hour + half_minute))
+        (*_, offset), _ = _strptime._strptime("-01:30:30.000001", "%z")
+        self.assertEqual(offset, -(one_hour + half_hour + half_minute + 0.000001))
         (*_, offset), _ = _strptime._strptime("Z", "%z")
         self.assertEqual(offset, 0)
 
+    def test_bad_offset(self):
+        with self.assertRaises(ValueError):
+            _strptime._strptime("-01:30:30.", "%z")
+        with self.assertRaises(ValueError):
+            _strptime._strptime("-0130:30", "%z")
+        with self.assertRaises(ValueError):
+            _strptime._strptime("-01:30:30.1234567", "%z")
+        with self.assertRaises(ValueError):
+            _strptime._strptime("-01:30:30:123456", "%z")
+        with self.assertRaises(ValueError):
+            _strptime._strptime("-01:3030", "%z")
+
     def test_timezone(self):
         # Test timezone directives.
         # When gmtime() is used with %Z, entire result of strftime() is empty.