Skip to content

Commit ac18b36

Browse files
committed
TST: out-> result and tm.ensure_clean
1 parent 5765b92 commit ac18b36

File tree

1 file changed

+35
-37
lines changed

1 file changed

+35
-37
lines changed

pandas/io/tests/parser/common.py

+35-37
Original file line numberDiff line numberDiff line change
@@ -1339,8 +1339,8 @@ def test_compact_ints_use_unsigned(self):
13391339
'b': np.array([9], dtype=np.int64),
13401340
'c': np.array([258], dtype=np.int64),
13411341
})
1342-
out = self.read_csv(StringIO(data))
1343-
tm.assert_frame_equal(out, expected)
1342+
result = self.read_csv(StringIO(data))
1343+
tm.assert_frame_equal(result, expected)
13441344

13451345
expected = DataFrame({
13461346
'a': np.array([1], dtype=np.int8),
@@ -1351,14 +1351,14 @@ def test_compact_ints_use_unsigned(self):
13511351
# default behaviour for 'use_unsigned'
13521352
with tm.assert_produces_warning(
13531353
FutureWarning, check_stacklevel=False):
1354-
out = self.read_csv(StringIO(data), compact_ints=True)
1355-
tm.assert_frame_equal(out, expected)
1354+
result = self.read_csv(StringIO(data), compact_ints=True)
1355+
tm.assert_frame_equal(result, expected)
13561356

13571357
with tm.assert_produces_warning(
13581358
FutureWarning, check_stacklevel=False):
1359-
out = self.read_csv(StringIO(data), compact_ints=True,
1359+
result = self.read_csv(StringIO(data), compact_ints=True,
13601360
use_unsigned=False)
1361-
tm.assert_frame_equal(out, expected)
1361+
tm.assert_frame_equal(result, expected)
13621362

13631363
expected = DataFrame({
13641364
'a': np.array([1], dtype=np.uint8),
@@ -1368,9 +1368,9 @@ def test_compact_ints_use_unsigned(self):
13681368

13691369
with tm.assert_produces_warning(
13701370
FutureWarning, check_stacklevel=False):
1371-
out = self.read_csv(StringIO(data), compact_ints=True,
1371+
result = self.read_csv(StringIO(data), compact_ints=True,
13721372
use_unsigned=True)
1373-
tm.assert_frame_equal(out, expected)
1373+
tm.assert_frame_equal(result, expected)
13741374

13751375
def test_compact_ints_as_recarray(self):
13761376
data = ('0,1,0,0\n'
@@ -1399,27 +1399,27 @@ def test_as_recarray(self):
13991399
data = 'a,b\n1,a\n2,b'
14001400
expected = np.array([(1, 'a'), (2, 'b')],
14011401
dtype=[('a', '<i8'), ('b', 'O')])
1402-
out = self.read_csv(StringIO(data), as_recarray=True)
1403-
tm.assert_numpy_array_equal(out, expected)
1402+
result = self.read_csv(StringIO(data), as_recarray=True)
1403+
tm.assert_numpy_array_equal(result, expected)
14041404

14051405
# index_col ignored
14061406
with tm.assert_produces_warning(
14071407
FutureWarning, check_stacklevel=False):
14081408
data = 'a,b\n1,a\n2,b'
14091409
expected = np.array([(1, 'a'), (2, 'b')],
14101410
dtype=[('a', '<i8'), ('b', 'O')])
1411-
out = self.read_csv(StringIO(data), as_recarray=True, index_col=0)
1412-
tm.assert_numpy_array_equal(out, expected)
1411+
result = self.read_csv(StringIO(data), as_recarray=True, index_col=0)
1412+
tm.assert_numpy_array_equal(result, expected)
14131413

14141414
# respects names
14151415
with tm.assert_produces_warning(
14161416
FutureWarning, check_stacklevel=False):
14171417
data = '1,a\n2,b'
14181418
expected = np.array([(1, 'a'), (2, 'b')],
14191419
dtype=[('a', '<i8'), ('b', 'O')])
1420-
out = self.read_csv(StringIO(data), names=['a', 'b'],
1420+
result = self.read_csv(StringIO(data), names=['a', 'b'],
14211421
header=None, as_recarray=True)
1422-
tm.assert_numpy_array_equal(out, expected)
1422+
tm.assert_numpy_array_equal(result, expected)
14231423

14241424
# header order is respected even though it conflicts
14251425
# with the natural ordering of the column names
@@ -1428,16 +1428,16 @@ def test_as_recarray(self):
14281428
data = 'b,a\n1,a\n2,b'
14291429
expected = np.array([(1, 'a'), (2, 'b')],
14301430
dtype=[('b', '<i8'), ('a', 'O')])
1431-
out = self.read_csv(StringIO(data), as_recarray=True)
1432-
tm.assert_numpy_array_equal(out, expected)
1431+
result = self.read_csv(StringIO(data), as_recarray=True)
1432+
tm.assert_numpy_array_equal(result, expected)
14331433

14341434
# overrides the squeeze parameter
14351435
with tm.assert_produces_warning(
14361436
FutureWarning, check_stacklevel=False):
14371437
data = 'a\n1'
14381438
expected = np.array([(1,)], dtype=[('a', '<i8')])
1439-
out = self.read_csv(StringIO(data), as_recarray=True, squeeze=True)
1440-
tm.assert_numpy_array_equal(out, expected)
1439+
result = self.read_csv(StringIO(data), as_recarray=True, squeeze=True)
1440+
tm.assert_numpy_array_equal(result, expected)
14411441

14421442
# does data conversions before doing recarray conversion
14431443
with tm.assert_produces_warning(
@@ -1446,18 +1446,18 @@ def test_as_recarray(self):
14461446
conv = lambda x: int(x) + 1
14471447
expected = np.array([(2, 'a'), (3, 'b')],
14481448
dtype=[('a', '<i8'), ('b', 'O')])
1449-
out = self.read_csv(StringIO(data), as_recarray=True,
1449+
result = self.read_csv(StringIO(data), as_recarray=True,
14501450
converters={'a': conv})
1451-
tm.assert_numpy_array_equal(out, expected)
1451+
tm.assert_numpy_array_equal(result, expected)
14521452

14531453
# filters by usecols before doing recarray conversion
14541454
with tm.assert_produces_warning(
14551455
FutureWarning, check_stacklevel=False):
14561456
data = 'a,b\n1,a\n2,b'
14571457
expected = np.array([(1,), (2,)], dtype=[('a', '<i8')])
1458-
out = self.read_csv(StringIO(data), as_recarray=True,
1458+
result = self.read_csv(StringIO(data), as_recarray=True,
14591459
usecols=['a'])
1460-
tm.assert_numpy_array_equal(out, expected)
1460+
tm.assert_numpy_array_equal(result, expected)
14611461

14621462
def test_memory_map(self):
14631463
mmap_file = os.path.join(self.dirpath, 'test_mmap.csv')
@@ -1467,25 +1467,23 @@ def test_memory_map(self):
14671467
'c': ['I', 'II', 'III']
14681468
})
14691469

1470-
out = self.read_csv(mmap_file, memory_map=True)
1471-
tm.assert_frame_equal(out, expected)
1470+
result = self.read_csv(mmap_file, memory_map=True)
1471+
tm.assert_frame_equal(result, expected)
14721472

14731473
def test_read_csv_utf_aliases(self):
14741474
# see gh issue 13549
14751475
path = 'test.csv'
14761476
expected = DataFrame({'A': [0, 1], 'B': [2, 3],
14771477
'multibyte_test': ['testing123', 'bananabis'],
14781478
'mb_nums': [154.868, 457.8798]})
1479-
1480-
for byte in [8, 16]:
1481-
expected.to_csv(path, encoding='utf-' + str(byte), index=False)
1482-
for fmt in ['utf-{0}', 'utf_{0}', 'UTF-{0}', 'UTF_{0}']:
1483-
encoding = fmt.format(byte)
1484-
for engine in ['c', 'python', None]:
1485-
out = self.read_csv(
1486-
path,
1487-
engine=engine,
1488-
encoding=encoding)
1489-
tm.assert_frame_equal(out, expected)
1490-
1491-
os.remove("test.csv")
1479+
with tm.ensure_clean(path) as path:
1480+
for byte in [8, 16]:
1481+
expected.to_csv(path, encoding='utf-' + str(byte), index=False)
1482+
for fmt in ['utf-{0}', 'utf_{0}', 'UTF-{0}', 'UTF_{0}']:
1483+
encoding = fmt.format(byte)
1484+
for engine in ['c', 'python', None]:
1485+
result = self.read_csv(
1486+
path,
1487+
engine=engine,
1488+
encoding=encoding)
1489+
tm.assert_frame_equal(result, expected)

0 commit comments

Comments
 (0)