From 4155965d31587ff33bea3956e44f2d9e002394af Mon Sep 17 00:00:00 2001 From: Aaron Critchley Date: Sat, 23 Dec 2017 02:20:49 +0000 Subject: [PATCH 1/2] Fixing depr warnings about escape sequences in usecols tests --- pandas/tests/io/parser/usecols.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/tests/io/parser/usecols.py b/pandas/tests/io/parser/usecols.py index 0fa53e6288bda..3253cd1114361 100644 --- a/pandas/tests/io/parser/usecols.py +++ b/pandas/tests/io/parser/usecols.py @@ -492,16 +492,16 @@ def test_raise_on_usecols_names_mismatch(self): tm.assert_frame_equal(df, expected) usecols = ['a', 'b', 'c', 'f'] - with tm.assert_raises_regex(ValueError, msg.format(missing="\['f'\]")): + with tm.assert_raises_regex(ValueError, msg.format(missing=r"\['f'\]")): self.read_csv(StringIO(data), usecols=usecols) usecols = ['a', 'b', 'f'] - with tm.assert_raises_regex(ValueError, msg.format(missing="\['f'\]")): + with tm.assert_raises_regex(ValueError, msg.format(missing=r"\['f'\]")): self.read_csv(StringIO(data), usecols=usecols) usecols = ['a', 'b', 'f', 'g'] with tm.assert_raises_regex( - ValueError, msg.format(missing="\[('f', 'g'|'g', 'f')\]")): + ValueError, msg.format(missing=r"\[('f', 'g'|'g', 'f')\]")): self.read_csv(StringIO(data), usecols=usecols) names = ['A', 'B', 'C', 'D'] @@ -525,9 +525,9 @@ def test_raise_on_usecols_names_mismatch(self): # tm.assert_frame_equal(df, expected) usecols = ['A', 'B', 'C', 'f'] - with tm.assert_raises_regex(ValueError, msg.format(missing="\['f'\]")): + with tm.assert_raises_regex(ValueError, msg.format(missing=r"\['f'\]")): self.read_csv(StringIO(data), header=0, names=names, usecols=usecols) usecols = ['A', 'B', 'f'] - with tm.assert_raises_regex(ValueError, msg.format(missing="\['f'\]")): + with tm.assert_raises_regex(ValueError, msg.format(missing=r"\['f'\]")): self.read_csv(StringIO(data), names=names, usecols=usecols) From 604b2a631e41c94fed2abab69bb2f5770c465170 Mon Sep 17 00:00:00 2001 From: Aaron Critchley Date: Sat, 23 Dec 2017 02:41:10 +0000 Subject: [PATCH 2/2] Remembering Flake8 for once --- pandas/tests/io/parser/usecols.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pandas/tests/io/parser/usecols.py b/pandas/tests/io/parser/usecols.py index 3253cd1114361..8767055239cd5 100644 --- a/pandas/tests/io/parser/usecols.py +++ b/pandas/tests/io/parser/usecols.py @@ -492,11 +492,13 @@ def test_raise_on_usecols_names_mismatch(self): tm.assert_frame_equal(df, expected) usecols = ['a', 'b', 'c', 'f'] - with tm.assert_raises_regex(ValueError, msg.format(missing=r"\['f'\]")): + with tm.assert_raises_regex( + ValueError, msg.format(missing=r"\['f'\]")): self.read_csv(StringIO(data), usecols=usecols) usecols = ['a', 'b', 'f'] - with tm.assert_raises_regex(ValueError, msg.format(missing=r"\['f'\]")): + with tm.assert_raises_regex( + ValueError, msg.format(missing=r"\['f'\]")): self.read_csv(StringIO(data), usecols=usecols) usecols = ['a', 'b', 'f', 'g'] @@ -525,9 +527,11 @@ def test_raise_on_usecols_names_mismatch(self): # tm.assert_frame_equal(df, expected) usecols = ['A', 'B', 'C', 'f'] - with tm.assert_raises_regex(ValueError, msg.format(missing=r"\['f'\]")): + with tm.assert_raises_regex( + ValueError, msg.format(missing=r"\['f'\]")): self.read_csv(StringIO(data), header=0, names=names, usecols=usecols) usecols = ['A', 'B', 'f'] - with tm.assert_raises_regex(ValueError, msg.format(missing=r"\['f'\]")): + with tm.assert_raises_regex( + ValueError, msg.format(missing=r"\['f'\]")): self.read_csv(StringIO(data), names=names, usecols=usecols)