py3: fix string slicing in util.parsetimezone()
authorYuya Nishihara <yuya@tcha.org>
Thu, 01 Mar 2018 18:15:58 -0500
changeset 36551 98d4c642d7f2
parent 36550 7f6be7121b28
child 36552 a185b1af207c
py3: fix string slicing in util.parsetimezone()
mercurial/util.py
--- a/mercurial/util.py	Thu Mar 01 18:06:25 2018 -0500
+++ b/mercurial/util.py	Thu Mar 01 18:15:58 2018 -0500
@@ -2353,6 +2353,7 @@
 def parsetimezone(s):
     """find a trailing timezone, if any, in string, and return a
        (offset, remainder) pair"""
+    s = pycompat.bytestr(s)
 
     if s.endswith("GMT") or s.endswith("UTC"):
         return 0, s[:-3].rstrip()