Add support for Z on %z directive

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)",
+            'z': r"(?P<z>[+-]\d\d:?[0-5]\d|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'),
@@ -455,13 +455,16 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
             iso_week = int(found_dict['V'])
         elif group_key == 'z':
             z = found_dict['z']
-            if z[3] == ':':
-                minute_start = 4
+            if z == 'Z':
+                tzoffset = 0
             else:
-                minute_start = 3
-            tzoffset = int(z[1:3]) * 60 + int(z[minute_start:minute_start+2])
-            if z.startswith("-"):
-                tzoffset = -tzoffset
+                if z[3] == ':':
+                    minute_start = 4
+                else:
+                    minute_start = 3
+                tzoffset = int(z[1:3]) * 60 + int(z[minute_start:minute_start+2])
+                if z.startswith("-"):
+                    tzoffset = -tzoffset
         elif group_key == 'Z':
             # Since -1 is default value only need to worry about setting tz if
             # it can be something other than -1.

Lib/test/test_strptime.py

@@ -318,14 +318,18 @@ def test_julian(self):
         self.helper('j', 7)
 
     def test_offset(self):
-        (*_, offset), _ = _strptime._strptime("+0100", "%z")
-        self.assertEqual(offset, 60 * 60)
+        one_hour = 60 * 60
+        half_hour = 30 * 60
+        (*_, offset), _ = _strptime._strptime("+0130", "%z")
+        self.assertEqual(offset, one_hour + half_hour)
         (*_, offset), _ = _strptime._strptime("-0100", "%z")
-        self.assertEqual(offset, -60 * 60)
+        self.assertEqual(offset, -one_hour)
         (*_, offset), _ = _strptime._strptime("+01:00", "%z")
-        self.assertEqual(offset, 60 * 60)
-        (*_, offset), _ = _strptime._strptime("-01:00", "%z")
-        self.assertEqual(offset, -60 * 60)
+        self.assertEqual(offset, one_hour)
+        (*_, offset), _ = _strptime._strptime("-01:30", "%z")
+        self.assertEqual(offset, -(one_hour + half_hour))
+        (*_, offset), _ = _strptime._strptime("Z", "%z")
+        self.assertEqual(offset, 0)
 
     def test_timezone(self):
         # Test timezone directives.