From 40a1c4a2d9740d41dba6912cd205d5fb1cfd3561 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 5 Nov 2014 21:44:52 +0100 Subject: [PATCH] Remove newline test --- qutebrowser/test/utils/test_split.py | 4 ---- qutebrowser/utils/split.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/qutebrowser/test/utils/test_split.py b/qutebrowser/test/utils/test_split.py index 8130c0804..5671b4026 100644 --- a/qutebrowser/test/utils/test_split.py +++ b/qutebrowser/test/utils/test_split.py @@ -97,7 +97,6 @@ foo\ x\x\"/foo xx"/foo\ x\x\"/ 'foo\ bar'/foo\ bar/'foo\ bar'/ 'foo\\ bar'/foo\\ bar/'foo\\ bar'/ foo\ bar/foo bar/foo\ bar/ -foo#bar\nbaz/foo#bar|baz/foo#bar\n|baz/ :-) ;-)/:-)|;-)/:-) |;-)/ áéíóú/áéíóú/áéíóú/ """ @@ -110,7 +109,6 @@ class SplitTests(unittest.TestCase): """Test splitting.""" for case in test_data.strip().splitlines(): cmd, *out = case.split('/')[:-1] - cmd = cmd.replace(r'\n', '\n') with self.subTest(cmd=cmd): items = split.split(cmd) self.assertEqual(items, out[0].split('|')) @@ -119,7 +117,6 @@ class SplitTests(unittest.TestCase): """Test if splitting with keep=True yields the original string.""" for case in test_data.strip().splitlines(): cmd, *_out = case.split('/')[:-1] - cmd = cmd.replace(r'\n', '\n') with self.subTest(cmd=cmd): items = split.split(cmd, keep=True) self.assertEqual(''.join(items), cmd) @@ -128,7 +125,6 @@ class SplitTests(unittest.TestCase): """Test splitting with keep=True.""" for case in test_data.strip().splitlines(): cmd, *out = case.split('/')[:-1] - cmd = cmd.replace(r'\n', '\n') with self.subTest(cmd=cmd): items = split.split(cmd, keep=True) self.assertEqual(items, out[1].split('|')) diff --git a/qutebrowser/utils/split.py b/qutebrowser/utils/split.py index b438d8d37..51c03e7b8 100644 --- a/qutebrowser/utils/split.py +++ b/qutebrowser/utils/split.py @@ -35,7 +35,7 @@ class ShellLexer: def __init__(self, s): self.iterator = iter(s) - self.whitespace = ' \t\r\n' + self.whitespace = ' \t\r' self.quotes = '\'"' self.escape = '\\' self.escapedquotes = '"'