Skip to content

Commit 379acb3

Browse files
committed
make travis pass
1 parent 3fb3ff1 commit 379acb3

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

pandas/tests/frame/test_validate.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
from unittest import TestCase
22
from pandas.core.frame import DataFrame
33

4+
45
class TestDataFrameValidate(TestCase):
56
"""Tests for error handling related to data types of method arguments."""
6-
7-
df = DataFrame({'a':[1,2], 'b':[3,4]})
7+
df = DataFrame({'a': [1, 2], 'b': [3, 4]})
88

99
def test_validate_bool_args(self):
1010
""" Tests for error handling related to boolean arguments. """
11-
invalid_values = [1, "True", [1,2,3], 5.0]
11+
invalid_values = [1, "True", [1, 2, 3], 5.0]
1212

1313
for value in invalid_values:
1414
with self.assertRaises(ValueError):

pandas/tests/series/test_validate.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33

44
class TestSeriesValidate(TestCase):
55
"""Tests for error handling related to data types of method arguments."""
6-
76
s = Series([1, 2, 3, 4, 5])
87

98
def test_validate_bool_args(self):
109
""" Tests for error handling related to boolean arguments. """
11-
invalid_values = [1, "True", [1,2,3], 5.0]
10+
invalid_values = [1, "True", [1, 2, 3], 5.0]
1211

1312
for value in invalid_values:
1413
with self.assertRaises(ValueError):

pandas/tests/test_base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,14 +1051,13 @@ def test_searchsorted(self):
10511051
self.assertTrue(0 <= index <= len(o))
10521052

10531053
def test_validate_bool_args(self):
1054-
invalid_values = [1, "True", [1,2,3], 5.0]
1054+
invalid_values = [1, "True", [1, 2, 3], 5.0]
10551055

10561056
for value in invalid_values:
10571057
with self.assertRaises(ValueError):
10581058
self.int_series.drop_duplicates(inplace=value)
10591059

10601060

1061-
10621061
class TestTranspose(Ops):
10631062
errmsg = "the 'axes' parameter is not supported"
10641063

pandas/tests/test_generic.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -643,12 +643,13 @@ def test_numpy_clip(self):
643643
lower, upper, out=col)
644644

645645
def test_validate_bool_args(self):
646-
df = DataFrame({'a':[1,2,3],'b':[4,5,6]})
646+
df = DataFrame({'a': [1, 2, 3], 'b': [4, 5, 6]})
647647
invalid_values = [1, "True", [1,2,3], 5.0]
648648

649649
for value in invalid_values:
650650
with self.assertRaises(ValueError):
651-
super(DataFrame, df).rename_axis(mapper={'a':'x','b':'y'}, axis=1, inplace=value)
651+
super(DataFrame, df).rename_axis(mapper={'a': 'x', 'b': 'y'},
652+
axis=1, inplace=value)
652653

653654
with self.assertRaises(ValueError):
654655
super(DataFrame, df).drop('a', axis=1, inplace=value)
@@ -663,7 +664,8 @@ def test_validate_bool_args(self):
663664
super(DataFrame, df).fillna(value=0, inplace=value)
664665

665666
with self.assertRaises(ValueError):
666-
super(DataFrame, df).replace(to_replace=1, value=7, inplace=value)
667+
super(DataFrame, df).replace(to_replace=1, value=7,
668+
inplace=value)
667669

668670
with self.assertRaises(ValueError):
669671
super(DataFrame, df).interpolate(inplace=value)

pandas/tests/test_internals.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,12 +860,12 @@ def test_single_mgr_ctor(self):
860860
self.assertEqual(mgr.as_matrix().tolist(), [0., 1., 2., 3., 4.])
861861

862862
def test_validate_bool_args(self):
863-
invalid_values = [1, "True", [1,2,3], 5.0]
863+
invalid_values = [1, "True", [1, 2, 3], 5.0]
864864
bm1 = create_mgr('a,b,c: i8-1; d,e,f: i8-2')
865865

866866
for value in invalid_values:
867867
with self.assertRaises(ValueError):
868-
bm1.replace_list([1],[2], inplace=value)
868+
bm1.replace_list([1], [2], inplace=value)
869869

870870

871871
class TestIndexing(object):

pandas/tests/test_util.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,14 @@ def test_validation(self):
202202

203203
def test_validate_bool_kwarg(self):
204204
arg_names = ['inplace', 'copy']
205-
invalid_values = [1, "True", [1,2,3], 5.0]
205+
invalid_values = [1, "True", [1, 2, 3], 5.0]
206206
valid_values = [True, False, None]
207207

208208
for name in arg_names:
209209
for value in invalid_values:
210-
with tm.assertRaisesRegexp(ValueError, "For argument \"%s\" expected type bool, received type %s" % (name, type(value).__name__)):
210+
with tm.assertRaisesRegexp(ValueError,
211+
"For argument \"%s\" expected type bool, received type %s" %\
212+
(name, type(value).__name__)):
211213
validate_bool_kwarg(value, name)
212214

213215
for value in valid_values:

0 commit comments

Comments
 (0)