From ac61422059fb85ddd3e66b787effbd0222ec4dd8 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 6 Nov 2014 08:25:46 +0100 Subject: [PATCH] Fix splitting of whitespace at EOL --- qutebrowser/test/utils/test_split.py | 1 + qutebrowser/utils/split.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qutebrowser/test/utils/test_split.py b/qutebrowser/test/utils/test_split.py index c937020f7..0d4315ffd 100644 --- a/qutebrowser/test/utils/test_split.py +++ b/qutebrowser/test/utils/test_split.py @@ -39,6 +39,7 @@ one "two three/one|two three/one| "two three/ one 'two three/one|two three/one| 'two three/ one\/one\/one\/ one "two\/one|two\/one| "two\/ +one /one/one| / foo bar/foo|bar/foo| bar/ foo bar/foo|bar/ foo| bar/ foo bar /foo|bar/ foo| bar| / diff --git a/qutebrowser/utils/split.py b/qutebrowser/utils/split.py index 2e69a8acd..63911d741 100644 --- a/qutebrowser/utils/split.py +++ b/qutebrowser/utils/split.py @@ -56,8 +56,6 @@ class ShellLexer: except StopIteration: if self.state in self.escape and not self.keep: self.token += self.state - if self.state in self.whitespace: - yield self.state if self.token or self.quoted: yield self.token return @@ -146,4 +144,7 @@ def split(s, keep=False): else: out.append(spaces + t) spaces = "" + if spaces: + out.append(spaces) + return out