# HG changeset patch # User Yuya Nishihara # Date 1489363814 25200 # Node ID 7556fe09cc48543c1ff46bff230bb7f6e9f793e0 # Parent c9fd842dc8864ea48b4b2519878e6a7f7d40c90d py3: convert set of revset initial symbols back to bytes Otherwise tokenize() would fail due to comparison between unicode and bytes. diff -r c9fd842dc886 -r 7556fe09cc48 mercurial/revsetlang.py --- a/mercurial/revsetlang.py Sun Mar 12 17:04:45 2017 -0700 +++ b/mercurial/revsetlang.py Sun Mar 12 17:10:14 2017 -0700 @@ -46,12 +46,13 @@ keywords = set(['and', 'or', 'not']) # default set of valid characters for the initial letter of symbols -_syminitletters = set( - string.ascii_letters + - string.digits + pycompat.sysstr('._@')) | set(map(chr, xrange(128, 256))) +_syminitletters = set(pycompat.iterbytestr( + string.ascii_letters.encode('ascii') + + string.digits.encode('ascii') + + '._@')) | set(map(pycompat.bytechr, xrange(128, 256))) # default set of valid characters for non-initial letters of symbols -_symletters = _syminitletters | set(pycompat.sysstr('-/')) +_symletters = _syminitletters | set(pycompat.iterbytestr('-/')) def tokenize(program, lookup=None, syminitletters=None, symletters=None): '''