Skip to content

Commit 9564ead

Browse files
jrebackjreback
committed
Merge pull request #6395 from bwignall/assert_6175_innotin
CLN: Change assert_(a [not] in b) to specialized forms
2 parents 52f877d + f7f9fdc commit 9564ead

File tree

9 files changed

+79
-79
lines changed

9 files changed

+79
-79
lines changed

‎pandas/io/tests/test_date_converters.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_parse_date_time(self):
4949
datecols = {'date_time': [0, 1]}
5050
df = read_table(StringIO(data), sep=',', header=0,
5151
parse_dates=datecols, date_parser=conv.parse_date_time)
52-
self.assert_('date_time' in df)
52+
self.assertIn('date_time', df)
5353
self.assertEqual(df.date_time.ix[0], datetime(2001, 1, 5, 10, 0, 0))
5454

5555
data = ("KORD,19990127, 19:00:00, 18:56:00, 0.8100\n"
@@ -73,7 +73,7 @@ def test_parse_date_fields(self):
7373
df = read_table(StringIO(data), sep=',', header=0,
7474
parse_dates=datecols,
7575
date_parser=conv.parse_date_fields)
76-
self.assert_('ymd' in df)
76+
self.assertIn('ymd', df)
7777
self.assertEqual(df.ymd.ix[0], datetime(2001, 1, 10))
7878

7979
def test_datetime_six_col(self):
@@ -90,7 +90,7 @@ def test_datetime_six_col(self):
9090
df = read_table(StringIO(data), sep=',', header=0,
9191
parse_dates=datecols,
9292
date_parser=conv.parse_all_fields)
93-
self.assert_('ymdHMS' in df)
93+
self.assertIn('ymdHMS', df)
9494
self.assertEqual(df.ymdHMS.ix[0], datetime(2001, 1, 5, 10, 0, 0))
9595

9696
def test_datetime_fractional_seconds(self):
@@ -103,7 +103,7 @@ def test_datetime_fractional_seconds(self):
103103
df = read_table(StringIO(data), sep=',', header=0,
104104
parse_dates=datecols,
105105
date_parser=conv.parse_all_fields)
106-
self.assert_('ymdHMS' in df)
106+
self.assertIn('ymdHMS', df)
107107
self.assertEqual(df.ymdHMS.ix[0], datetime(2001, 1, 5, 10, 0, 0,
108108
microsecond=123456))
109109
self.assertEqual(df.ymdHMS.ix[1], datetime(2001, 1, 5, 10, 0, 0,
@@ -116,7 +116,7 @@ def test_generic(self):
116116
df = read_table(StringIO(data), sep=',', header=0,
117117
parse_dates=datecols,
118118
date_parser=dateconverter)
119-
self.assert_('ym' in df)
119+
self.assertIn('ym', df)
120120
self.assertEqual(df.ym.ix[0], date(2001, 1, 1))
121121

122122

‎pandas/io/tests/test_html.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,10 @@ def test_gold_canyon(self):
499499
with open(self.banklist_data, 'r') as f:
500500
raw_text = f.read()
501501

502-
self.assert_(gc in raw_text)
502+
self.assertIn(gc, raw_text)
503503
df = self.read_html(self.banklist_data, 'Gold Canyon',
504504
attrs={'id': 'table'})[0]
505-
self.assert_(gc in df.to_string())
505+
self.assertIn(gc, df.to_string())
506506

507507
def test_different_number_of_rows(self):
508508
expected = """<table border="1" class="dataframe">

‎pandas/io/tests/test_parsers.py

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,11 @@ def func(*date_cols):
302302
prefix='X',
303303
parse_dates={'nominal': [1, 2],
304304
'actual': [1, 3]})
305-
self.assert_('nominal' in df)
306-
self.assert_('actual' in df)
307-
self.assert_('X1' not in df)
308-
self.assert_('X2' not in df)
309-
self.assert_('X3' not in df)
305+
self.assertIn('nominal', df)
306+
self.assertIn('actual', df)
307+
self.assertNotIn('X1', df)
308+
self.assertNotIn('X2', df)
309+
self.assertNotIn('X3', df)
310310

311311
d = datetime(1999, 1, 27, 19, 0)
312312
self.assertEqual(df.ix[0, 'nominal'], d)
@@ -316,12 +316,12 @@ def func(*date_cols):
316316
parse_dates={'nominal': [1, 2],
317317
'actual': [1, 3]},
318318
keep_date_col=True)
319-
self.assert_('nominal' in df)
320-
self.assert_('actual' in df)
319+
self.assertIn('nominal', df)
320+
self.assertIn('actual', df)
321321

322-
self.assert_(1 in df)
323-
self.assert_(2 in df)
324-
self.assert_(3 in df)
322+
self.assertIn(1, df)
323+
self.assertIn(2, df)
324+
self.assertIn(3, df)
325325

326326
data = """\
327327
KORD,19990127, 19:00:00, 18:56:00, 0.8100, 2.8100, 7.2000, 0.0000, 280.0000
@@ -335,23 +335,23 @@ def func(*date_cols):
335335
prefix='X',
336336
parse_dates=[[1, 2], [1, 3]])
337337

338-
self.assert_('X1_X2' in df)
339-
self.assert_('X1_X3' in df)
340-
self.assert_('X1' not in df)
341-
self.assert_('X2' not in df)
342-
self.assert_('X3' not in df)
338+
self.assertIn('X1_X2', df)
339+
self.assertIn('X1_X3', df)
340+
self.assertNotIn('X1', df)
341+
self.assertNotIn('X2', df)
342+
self.assertNotIn('X3', df)
343343

344344
d = datetime(1999, 1, 27, 19, 0)
345345
self.assertEqual(df.ix[0, 'X1_X2'], d)
346346

347347
df = read_csv(StringIO(data), header=None,
348348
parse_dates=[[1, 2], [1, 3]], keep_date_col=True)
349349

350-
self.assert_('1_2' in df)
351-
self.assert_('1_3' in df)
352-
self.assert_(1 in df)
353-
self.assert_(2 in df)
354-
self.assert_(3 in df)
350+
self.assertIn('1_2', df)
351+
self.assertIn('1_3', df)
352+
self.assertIn(1, df)
353+
self.assertIn(2, df)
354+
self.assertIn(3, df)
355355

356356
data = '''\
357357
KORD,19990127 19:00:00, 18:56:00, 0.8100, 2.8100, 7.2000, 0.0000, 280.0000
@@ -378,7 +378,7 @@ def test_multiple_date_cols_int_cast(self):
378378
# it works!
379379
df = self.read_csv(StringIO(data), header=None, parse_dates=date_spec,
380380
date_parser=conv.parse_date_time)
381-
self.assert_('nominal' in df)
381+
self.assertIn('nominal', df)
382382

383383
def test_multiple_date_col_timestamp_parse(self):
384384
data = """05/31/2012,15:30:00.029,1306.25,1,E,0,,1306.25
@@ -523,7 +523,7 @@ def test_malformed(self):
523523
StringIO(data), sep=',', header=1, comment='#')
524524
self.assert_(False)
525525
except Exception as inst:
526-
self.assert_('Expected 3 fields in line 4, saw 5' in str(inst))
526+
self.assertIn('Expected 3 fields in line 4, saw 5', str(inst))
527527

528528
# skip_footer
529529
data = """ignore
@@ -540,7 +540,7 @@ def test_malformed(self):
540540
skip_footer=1)
541541
self.assert_(False)
542542
except Exception as inst:
543-
self.assert_('Expected 3 fields in line 4, saw 5' in str(inst))
543+
self.assertIn('Expected 3 fields in line 4, saw 5', str(inst))
544544

545545
# first chunk
546546
data = """ignore
@@ -558,7 +558,7 @@ def test_malformed(self):
558558
df = it.read(5)
559559
self.assert_(False)
560560
except Exception as inst:
561-
self.assert_('Expected 3 fields in line 6, saw 5' in str(inst))
561+
self.assertIn('Expected 3 fields in line 6, saw 5', str(inst))
562562

563563
# middle chunk
564564
data = """ignore
@@ -577,7 +577,7 @@ def test_malformed(self):
577577
it.read(2)
578578
self.assert_(False)
579579
except Exception as inst:
580-
self.assert_('Expected 3 fields in line 6, saw 5' in str(inst))
580+
self.assertIn('Expected 3 fields in line 6, saw 5', str(inst))
581581

582582
# last chunk
583583
data = """ignore
@@ -596,7 +596,7 @@ def test_malformed(self):
596596
it.read()
597597
self.assert_(False)
598598
except Exception as inst:
599-
self.assert_('Expected 3 fields in line 6, saw 5' in str(inst))
599+
self.assertIn('Expected 3 fields in line 6, saw 5', str(inst))
600600

601601
def test_passing_dtype(self):
602602

@@ -1698,7 +1698,7 @@ def test_multiple_date_cols_chunked(self):
16981698

16991699
chunks = list(reader)
17001700

1701-
self.assert_('nominalTime' not in df)
1701+
self.assertNotIn('nominalTime', df)
17021702

17031703
tm.assert_frame_equal(chunks[0], df[:2])
17041704
tm.assert_frame_equal(chunks[1], df[2:4])

‎pandas/io/tests/test_pytables.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -365,18 +365,18 @@ def test_contains(self):
365365
store['a'] = tm.makeTimeSeries()
366366
store['b'] = tm.makeDataFrame()
367367
store['foo/bar'] = tm.makeDataFrame()
368-
self.assert_('a' in store)
369-
self.assert_('b' in store)
370-
self.assert_('c' not in store)
371-
self.assert_('foo/bar' in store)
372-
self.assert_('/foo/bar' in store)
373-
self.assert_('/foo/b' not in store)
374-
self.assert_('bar' not in store)
368+
self.assertIn('a', store)
369+
self.assertIn('b', store)
370+
self.assertNotIn('c', store)
371+
self.assertIn('foo/bar', store)
372+
self.assertIn('/foo/bar', store)
373+
self.assertNotIn('/foo/b', store)
374+
self.assertNotIn('bar', store)
375375

376376
# GH 2694
377377
warnings.filterwarnings('ignore', category=tables.NaturalNameWarning)
378378
store['node())'] = tm.makeDataFrame()
379-
self.assert_('node())' in store)
379+
self.assertIn('node())', store)
380380

381381
def test_versioning(self):
382382

@@ -3875,10 +3875,10 @@ def test_multiple_open_close(self):
38753875

38763876
# single
38773877
store = HDFStore(path)
3878-
self.assert_('CLOSED' not in str(store))
3878+
self.assertNotIn('CLOSED', str(store))
38793879
self.assert_(store.is_open)
38803880
store.close()
3881-
self.assert_('CLOSED' in str(store))
3881+
self.assertIn('CLOSED', str(store))
38823882
self.assert_(not store.is_open)
38833883

38843884
with ensure_clean_path(self.path) as path:
@@ -3898,20 +3898,20 @@ def f():
38983898
store1 = HDFStore(path)
38993899
store2 = HDFStore(path)
39003900

3901-
self.assert_('CLOSED' not in str(store1))
3902-
self.assert_('CLOSED' not in str(store2))
3901+
self.assertNotIn('CLOSED', str(store1))
3902+
self.assertNotIn('CLOSED', str(store2))
39033903
self.assert_(store1.is_open)
39043904
self.assert_(store2.is_open)
39053905

39063906
store1.close()
3907-
self.assert_('CLOSED' in str(store1))
3907+
self.assertIn('CLOSED', str(store1))
39083908
self.assert_(not store1.is_open)
3909-
self.assert_('CLOSED' not in str(store2))
3909+
self.assertNotIn('CLOSED', str(store2))
39103910
self.assert_(store2.is_open)
39113911

39123912
store2.close()
3913-
self.assert_('CLOSED' in str(store1))
3914-
self.assert_('CLOSED' in str(store2))
3913+
self.assertIn('CLOSED', str(store1))
3914+
self.assertIn('CLOSED', str(store2))
39153915
self.assert_(not store1.is_open)
39163916
self.assert_(not store2.is_open)
39173917

@@ -3922,11 +3922,11 @@ def f():
39223922
store2 = HDFStore(path)
39233923
store2.append('df2',df)
39243924
store2.close()
3925-
self.assert_('CLOSED' in str(store2))
3925+
self.assertIn('CLOSED', str(store2))
39263926
self.assert_(not store2.is_open)
39273927

39283928
store.close()
3929-
self.assert_('CLOSED' in str(store))
3929+
self.assertIn('CLOSED', str(store))
39303930
self.assert_(not store.is_open)
39313931

39323932
# double closing
@@ -3935,11 +3935,11 @@ def f():
39353935

39363936
store2 = HDFStore(path)
39373937
store.close()
3938-
self.assert_('CLOSED' in str(store))
3938+
self.assertIn('CLOSED', str(store))
39393939
self.assert_(not store.is_open)
39403940

39413941
store2.close()
3942-
self.assert_('CLOSED' in str(store2))
3942+
self.assertIn('CLOSED', str(store2))
39433943
self.assert_(not store2.is_open)
39443944

39453945
# ops on a closed store

‎pandas/sparse/tests/test_sparse.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,15 +1200,15 @@ def test_delitem(self):
12001200
C = self.frame['C']
12011201

12021202
del self.frame['B']
1203-
self.assert_('B' not in self.frame)
1203+
self.assertNotIn('B', self.frame)
12041204
assert_sp_series_equal(self.frame['A'], A)
12051205
assert_sp_series_equal(self.frame['C'], C)
12061206

12071207
del self.frame['D']
1208-
self.assert_('D' not in self.frame)
1208+
self.assertNotIn('D', self.frame)
12091209

12101210
del self.frame['A']
1211-
self.assert_('A' not in self.frame)
1211+
self.assertNotIn('A', self.frame)
12121212

12131213
def test_set_columns(self):
12141214
self.frame.columns = self.frame.columns
@@ -1372,11 +1372,11 @@ def _check_frame(frame):
13721372
# with copy=False
13731373
reindexed = self.frame.reindex(self.frame.index, copy=False)
13741374
reindexed['F'] = reindexed['A']
1375-
self.assert_('F' in self.frame)
1375+
self.assertIn('F', self.frame)
13761376

13771377
reindexed = self.frame.reindex(self.frame.index)
13781378
reindexed['G'] = reindexed['A']
1379-
self.assert_('G' not in self.frame)
1379+
self.assertNotIn('G', self.frame)
13801380

13811381
def test_reindex_fill_value(self):
13821382
rng = bdate_range('20110110', periods=20)
@@ -1702,7 +1702,7 @@ def _compare_with_dense(swp, items, major, minor):
17021702
# test copying
17031703
cp = self.panel.reindex(self.panel.major_axis, copy=True)
17041704
cp['ItemA']['E'] = cp['ItemA']['A']
1705-
self.assert_('E' not in self.panel['ItemA'])
1705+
self.assertNotIn('E', self.panel['ItemA'])
17061706

17071707
def test_operators(self):
17081708
def _check_ops(panel):

‎pandas/tools/tests/test_merge.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,15 @@ def test_handle_overlap(self):
179179
joined = merge(self.df, self.df2, on='key2',
180180
suffixes=['.foo', '.bar'])
181181

182-
self.assert_('key1.foo' in joined)
183-
self.assert_('key1.bar' in joined)
182+
self.assertIn('key1.foo', joined)
183+
self.assertIn('key1.bar', joined)
184184

185185
def test_handle_overlap_arbitrary_key(self):
186186
joined = merge(self.df, self.df2,
187187
left_on='key2', right_on='key1',
188188
suffixes=['.foo', '.bar'])
189-
self.assert_('key1.foo' in joined)
190-
self.assert_('key2.bar' in joined)
189+
self.assertIn('key1.foo', joined)
190+
self.assertIn('key2.bar', joined)
191191

192192
def test_merge_common(self):
193193
joined = merge(self.df, self.df2)
@@ -269,7 +269,7 @@ def test_join_with_len0(self):
269269
# nothing to merge
270270
merged = self.target.join(self.source.reindex([]), on='C')
271271
for col in self.source:
272-
self.assert_(col in merged)
272+
self.assertIn(col, merged)
273273
self.assert_(merged[col].isnull().all())
274274

275275
merged2 = self.target.join(self.source.reindex([]), on='C',
@@ -565,8 +565,8 @@ def test_merge_overlap(self):
565565
merged = merge(self.left, self.left, on='key')
566566
exp_len = (self.left['key'].value_counts() ** 2).sum()
567567
self.assertEqual(len(merged), exp_len)
568-
self.assert_('v1_x' in merged)
569-
self.assert_('v1_y' in merged)
568+
self.assertIn('v1_x', merged)
569+
self.assertIn('v1_y', merged)
570570

571571
def test_merge_different_column_key_names(self):
572572
left = DataFrame({'lkey': ['foo', 'bar', 'baz', 'foo'],
@@ -1222,10 +1222,10 @@ def test_append(self):
12221222

12231223
del end_frame['A']
12241224
partial_appended = begin_frame.append(end_frame)
1225-
self.assert_('A' in partial_appended)
1225+
self.assertIn('A', partial_appended)
12261226

12271227
partial_appended = end_frame.append(begin_frame)
1228-
self.assert_('A' in partial_appended)
1228+
self.assertIn('A', partial_appended)
12291229

12301230
# mixed type handling
12311231
appended = self.mixed_frame[:5].append(self.mixed_frame[5:])

0 commit comments

Comments
 (0)