Skip to content

Commit 51c72fc

Browse files
committed
TST: Removed double import in test io.tests.parser_tests.
1 parent 0922599 commit 51c72fc

File tree

1 file changed

+32
-37
lines changed

1 file changed

+32
-37
lines changed

pandas/io/tests/test_parsers.py

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,13 @@
1313

1414
from pandas import DataFrame, Series, Index, MultiIndex, DatetimeIndex
1515
from pandas.compat import(
16-
StringIO, BytesIO, PY3, range, long, lrange, lmap, u, map, StringIO
16+
StringIO, BytesIO, PY3, range, long, lrange, lmap, u
1717
)
1818
from pandas.io.common import urlopen, URLError
1919
import pandas.io.parsers as parsers
2020
from pandas.io.parsers import (read_csv, read_table, read_fwf,
2121
TextFileReader, TextParser)
22-
from pandas.util.testing import (assert_equal,
23-
assert_almost_equal,
24-
assert_series_equal,
25-
makeCustomDataframe as mkdf,
26-
network,
27-
ensure_clean)
22+
2823
import pandas.util.testing as tm
2924
import pandas as pd
3025

@@ -217,9 +212,9 @@ def test_1000_sep_with_decimal(self):
217212
'C': [5, 10.]
218213
})
219214

220-
assert_equal(expected.A.dtype, 'int64')
221-
assert_equal(expected.B.dtype, 'float')
222-
assert_equal(expected.C.dtype, 'float')
215+
tm.assert_equal(expected.A.dtype, 'int64')
216+
tm.assert_equal(expected.B.dtype, 'float')
217+
tm.assert_equal(expected.C.dtype, 'float')
223218

224219
df = self.read_csv(StringIO(data), sep='|', thousands=',', decimal='.')
225220
tm.assert_frame_equal(df, expected)
@@ -247,7 +242,7 @@ def test_squeeze(self):
247242
result = self.read_table(StringIO(data), sep=',', index_col=0,
248243
header=None, squeeze=True)
249244
tm.assert_isinstance(result, Series)
250-
assert_series_equal(result, expected)
245+
tm.assert_series_equal(result, expected)
251246

252247
def test_inf_parsing(self):
253248
data = """\
@@ -265,9 +260,9 @@ def test_inf_parsing(self):
265260
inf = float('inf')
266261
expected = Series([inf, -inf] * 5)
267262
df = read_csv(StringIO(data), index_col=0)
268-
assert_almost_equal(df['A'].values, expected.values)
263+
tm.assert_almost_equal(df['A'].values, expected.values)
269264
df = read_csv(StringIO(data), index_col=0, na_filter=False)
270-
assert_almost_equal(df['A'].values, expected.values)
265+
tm.assert_almost_equal(df['A'].values, expected.values)
271266

272267
def test_multiple_date_col(self):
273268
# Can use multiple date parsers
@@ -588,7 +583,7 @@ def test_passing_dtype(self):
588583

589584
df = DataFrame(np.random.rand(5,2),columns=list('AB'),index=['1A','1B','1C','1D','1E'])
590585

591-
with ensure_clean('__passing_str_as_dtype__.csv') as path:
586+
with tm.ensure_clean('__passing_str_as_dtype__.csv') as path:
592587
df.to_csv(path)
593588

594589
# GH 3795
@@ -630,7 +625,7 @@ def test_quoting(self):
630625

631626
def test_non_string_na_values(self):
632627
# GH3611, na_values that are not a string are an issue
633-
with ensure_clean('__non_string_na_values__.csv') as path:
628+
with tm.ensure_clean('__non_string_na_values__.csv') as path:
634629
df = DataFrame({'A' : [-999, 2, 3], 'B' : [1.2, -999, 4.5]})
635630
df.to_csv(path, sep=' ', index=False)
636631
result1 = read_csv(path, sep= ' ', header=0, na_values=['-999.0','-999'])
@@ -681,15 +676,15 @@ def test_custom_na_values(self):
681676
[7, 8, nan]]
682677

683678
df = self.read_csv(StringIO(data), na_values=['baz'], skiprows=[1])
684-
assert_almost_equal(df.values, expected)
679+
tm.assert_almost_equal(df.values, expected)
685680

686681
df2 = self.read_table(StringIO(data), sep=',', na_values=['baz'],
687682
skiprows=[1])
688-
assert_almost_equal(df2.values, expected)
683+
tm.assert_almost_equal(df2.values, expected)
689684

690685
df3 = self.read_table(StringIO(data), sep=',', na_values='baz',
691686
skiprows=[1])
692-
assert_almost_equal(df3.values, expected)
687+
tm.assert_almost_equal(df3.values, expected)
693688

694689
def test_nat_parse(self):
695690

@@ -699,7 +694,7 @@ def test_nat_parse(self):
699694
'B' : pd.Timestamp('20010101') }))
700695
df.iloc[3:6,:] = np.nan
701696

702-
with ensure_clean('__nat_parse_.csv') as path:
697+
with tm.ensure_clean('__nat_parse_.csv') as path:
703698
df.to_csv(path)
704699
result = read_csv(path,index_col=0,parse_dates=['B'])
705700
tm.assert_frame_equal(result,df)
@@ -750,7 +745,7 @@ def test_detect_string_na(self):
750745
[nan, nan]]
751746

752747
df = self.read_csv(StringIO(data))
753-
assert_almost_equal(df.values, expected)
748+
tm.assert_almost_equal(df.values, expected)
754749

755750
def test_unnamed_columns(self):
756751
data = """A,B,C,,
@@ -762,7 +757,7 @@ def test_unnamed_columns(self):
762757
[6, 7, 8, 9, 10],
763758
[11, 12, 13, 14, 15]]
764759
df = self.read_table(StringIO(data), sep=',')
765-
assert_almost_equal(df.values, expected)
760+
tm.assert_almost_equal(df.values, expected)
766761
self.assert_(np.array_equal(df.columns,
767762
['A', 'B', 'C', 'Unnamed: 3',
768763
'Unnamed: 4']))
@@ -913,8 +908,8 @@ def test_no_header(self):
913908
expected = [[1, 2, 3, 4, 5.],
914909
[6, 7, 8, 9, 10],
915910
[11, 12, 13, 14, 15]]
916-
assert_almost_equal(df.values, expected)
917-
assert_almost_equal(df.values, df2.values)
911+
tm.assert_almost_equal(df.values, expected)
912+
tm.assert_almost_equal(df.values, df2.values)
918913

919914
self.assert_(np.array_equal(df_pref.columns,
920915
['X0', 'X1', 'X2', 'X3', 'X4']))
@@ -1177,7 +1172,7 @@ def test_header_not_first_line(self):
11771172
tm.assert_frame_equal(df, expected)
11781173

11791174
def test_header_multi_index(self):
1180-
expected = mkdf(5,3,r_idx_nlevels=2,c_idx_nlevels=4)
1175+
expected = tm.makeCustomDataframe(5,3,r_idx_nlevels=2,c_idx_nlevels=4)
11811176

11821177
data = """\
11831178
C0,,C_l0_g0,C_l0_g1,C_l0_g2
@@ -1477,7 +1472,7 @@ def test_na_value_dict(self):
14771472
tm.assert_frame_equal(df, xp)
14781473

14791474
@slow
1480-
@network
1475+
@tm.network
14811476
def test_url(self):
14821477
try:
14831478
# HTTP(S)
@@ -1492,7 +1487,7 @@ def test_url(self):
14921487

14931488
except URLError:
14941489
try:
1495-
with closing(urlopen('http://www.google.com')) as resp:
1490+
with tm.closing(urlopen('http://www.google.com')) as resp:
14961491
pass
14971492
except URLError:
14981493
raise nose.SkipTest
@@ -1597,11 +1592,11 @@ def test_comment(self):
15971592
expected = [[1., 2., 4.],
15981593
[5., np.nan, 10.]]
15991594
df = self.read_csv(StringIO(data), comment='#')
1600-
assert_almost_equal(df.values, expected)
1595+
tm.assert_almost_equal(df.values, expected)
16011596

16021597
df = self.read_table(StringIO(data), sep=',', comment='#',
16031598
na_values=['NaN'])
1604-
assert_almost_equal(df.values, expected)
1599+
tm.assert_almost_equal(df.values, expected)
16051600

16061601
def test_bool_na_values(self):
16071602
data = """A,B,C
@@ -1659,7 +1654,7 @@ def test_utf16_bom_skiprows(self):
16591654

16601655
path = '__%s__.csv' % tm.rands(10)
16611656

1662-
with ensure_clean(path) as path:
1657+
with tm.ensure_clean(path) as path:
16631658
for sep, dat in [('\t', data), (',', data2)]:
16641659
for enc in ['utf-16', 'utf-16le', 'utf-16be']:
16651660
bytes = dat.encode(enc)
@@ -1924,7 +1919,7 @@ def test_1000_fwf(self):
19241919
[10, 13, 10]]
19251920
df = read_fwf(StringIO(data), colspecs=[(0, 3), (3, 11), (12, 16)],
19261921
thousands=',')
1927-
assert_almost_equal(df.values, expected)
1922+
tm.assert_almost_equal(df.values, expected)
19281923

19291924
def test_1000_sep_with_decimal(self):
19301925
data = """A|B|C
@@ -1953,7 +1948,7 @@ def test_comment_fwf(self):
19531948
[5, np.nan, 10.]]
19541949
df = read_fwf(StringIO(data), colspecs=[(0, 3), (4, 9), (9, 25)],
19551950
comment='#')
1956-
assert_almost_equal(df.values, expected)
1951+
tm.assert_almost_equal(df.values, expected)
19571952

19581953
def test_fwf(self):
19591954
data_expected = """\
@@ -2075,7 +2070,7 @@ def test_iteration_open_handle(self):
20752070
if PY3:
20762071
raise nose.SkipTest
20772072

2078-
with ensure_clean() as path:
2073+
with tm.ensure_clean() as path:
20792074
with open(path, 'wb') as f:
20802075
f.write('AAA\nBBB\nCCC\nDDD\nEEE\nFFF\nGGG')
20812076

@@ -2294,7 +2289,7 @@ def test_decompression(self):
22942289
data = open(self.csv1, 'rb').read()
22952290
expected = self.read_csv(self.csv1)
22962291

2297-
with ensure_clean() as path:
2292+
with tm.ensure_clean() as path:
22982293
tmp = gzip.GzipFile(path, mode='wb')
22992294
tmp.write(data)
23002295
tmp.close()
@@ -2305,7 +2300,7 @@ def test_decompression(self):
23052300
result = self.read_csv(open(path, 'rb'), compression='gzip')
23062301
tm.assert_frame_equal(result, expected)
23072302

2308-
with ensure_clean() as path:
2303+
with tm.ensure_clean() as path:
23092304
tmp = bz2.BZ2File(path, mode='wb')
23102305
tmp.write(data)
23112306
tmp.close()
@@ -2330,15 +2325,15 @@ def test_decompression_regex_sep(self):
23302325
data = data.replace(b',', b'::')
23312326
expected = self.read_csv(self.csv1)
23322327

2333-
with ensure_clean() as path:
2328+
with tm.ensure_clean() as path:
23342329
tmp = gzip.GzipFile(path, mode='wb')
23352330
tmp.write(data)
23362331
tmp.close()
23372332

23382333
result = self.read_csv(path, sep='::', compression='gzip')
23392334
tm.assert_frame_equal(result, expected)
23402335

2341-
with ensure_clean() as path:
2336+
with tm.ensure_clean() as path:
23422337
tmp = bz2.BZ2File(path, mode='wb')
23432338
tmp.write(data)
23442339
tmp.close()
@@ -2552,7 +2547,7 @@ def test_convert_sql_column_decimals(self):
25522547

25532548
def assert_same_values_and_dtype(res, exp):
25542549
assert(res.dtype == exp.dtype)
2555-
assert_almost_equal(res, exp)
2550+
tm.assert_almost_equal(res, exp)
25562551

25572552

25582553
if __name__ == '__main__':

0 commit comments

Comments
 (0)