# HG changeset patch # User Yuya Nishihara # Date 1519946158 18000 # Node ID 98d4c642d7f2c182339d9504de48a13f328b5c51 # Parent 7f6be7121b28de555c6e7b7c6916d0a9e9cbd19c py3: fix string slicing in util.parsetimezone() diff -r 7f6be7121b28 -r 98d4c642d7f2 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()