date: parse ISO-style Z and +hh:mm timezone specs stable
authorMatt Mackall <mpm@selenic.com>
Wed, 27 Jul 2016 15:20:34 -0500
branchstable
changeset 29637 46b2ccce7fde
parent 29636 84ef4517de03
child 29638 491ee264b9f6
date: parse ISO-style Z and +hh:mm timezone specs
mercurial/util.py
--- a/mercurial/util.py	Wed Jul 27 15:14:19 2016 -0500
+++ b/mercurial/util.py	Wed Jul 27 15:20:34 2016 -0500
@@ -1760,6 +1760,18 @@
         minutes = int(s[-2:])
         return -sign * (hours * 60 + minutes) * 60, s[:-5].rstrip()
 
+    # ISO8601 trailing Z
+    if s.endswith("Z") and s[-2:-1].isdigit():
+        return 0, s[:-1]
+
+    # ISO8601-style [+-]hh:mm
+    if (len(s) >= 6 and s[-6] in "+-" and s[-3] == ":" and
+        s[-5:-3].isdigit() and s[-2:].isdigit()):
+        sign = (s[-6] == "+") and 1 or -1
+        hours = int(s[-5:-3])
+        minutes = int(s[-2:])
+        return -sign * (hours * 60 + minutes) * 60, s[:-6]
+
     return None, s
 
 def strdate(string, format, defaults=[]):