ttygroup/gertty
Code Issues Proposed changes

Merge "tokenizer: do not try to decode strings on Python 3"

Browse Source
This commit is contained in:
Zuul 2020-12-18 16:52:18 +00:00 committed by Gerrit Code Review
commit 119f96f293
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gertty/search/tokenizer.py
View File

@ -82,12 +82,16 @@ def SearchTokenizer():
def t_SSTRING(t): def t_SSTRING(t):
r"'([^\\']+|\\'|\\\\)*'" r"'([^\\']+|\\'|\\\\)*'"
t.value=t.value[1:-1].decode("string-escape") t.value = t.value[1:-1]
if not isinstance(t.value, six.text_type):
t.value = t.value.decode('string-escape')
return t return t
def t_DSTRING(t): def t_DSTRING(t):
r'"([^\\"]+|\\"|\\\\)*"' r'"([^\\"]+|\\"|\\\\)*"'
t.value=t.value[1:-1].decode("string-escape") t.value = t.value[1:-1]
if not isinstance(t.value, six.text_type):
t.value = t.value.decode('string-escape')
return t return t
def t_AND(t): def t_AND(t):