# HG changeset patch # User Yuya Nishihara # Date 1519941398 18000 # Node ID 14bbb54a9c5bc917c1a2b75bf631394514d8f7b6 # Parent ab7f86a748e6f84ffcd7d0eafc5786924d0e6c2a py3: fix type of string literals in templater.tokenize() # skip-blame because just b'' prefixes diff -r ab7f86a748e6 -r 14bbb54a9c5b mercurial/templater.py --- a/mercurial/templater.py Thu Mar 01 16:52:17 2018 -0500 +++ b/mercurial/templater.py Thu Mar 01 16:56:38 2018 -0500 @@ -98,8 +98,8 @@ pos += 1 yield ('integer', program[s:pos], s) pos -= 1 - elif (c == '\\' and program[pos:pos + 2] in (r"\'", r'\"') - or c == 'r' and program[pos:pos + 3] in (r"r\'", r'r\"')): + elif (c == '\\' and program[pos:pos + 2] in (br"\'", br'\"') + or c == 'r' and program[pos:pos + 3] in (br"r\'", br'r\"')): # handle escaped quoted strings for compatibility with 2.9.2-3.4, # where some of nested templates were preprocessed as strings and # then compiled. therefore, \"...\" was allowed. (issue4733)