rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

safe_shlex_split: cleanup and don't do double-lexing

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-18 16:58:38 +02:00
parent 1c1534b5f6
commit 7f76c3ba13
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qutebrowser/utils/utils.py
View File

@ -123,7 +123,6 @@ def safe_shlex_split(s):
We try 3 times so multiple errors can be fixed. We try 3 times so multiple errors can be fixed.
""" """
tokens = None
orig_s = s orig_s = s
for i in range(3): for i in range(3):
lexer = _get_lexer(s) lexer = _get_lexer(s)
@ -139,11 +138,11 @@ def safe_shlex_split(s):
"Lexer state is >{}< while parsing >{}< (attempted fixup: " "Lexer state is >{}< while parsing >{}< (attempted fixup: "
">{}<)".format(lexer.state, orig_s, s)) ">{}<)".format(lexer.state, orig_s, s))
s += lexer.state s += lexer.state
if tokens is None: else:
raise AssertionError("Gave up splitting >{}< after {} tries. "
"Attempted fixup: >{}<. This is a bug.".format(
orig_s, i, s))
return tokens return tokens
# We should never arrive here.
raise AssertionError("Gave up splitting >{}< after {} tries. "
"Attempted fixup: >{}<.".format(orig_s, i, s))
def pastebin(text): def pastebin(text):