Skip to content

Commit cdf1a6a

Browse files
changes based on review
1 parent f840737 commit cdf1a6a

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

pandas/tests/frame/test_to_csv.py

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ def test_to_csv_from_csv3(self):
120120

121121
df1.to_csv(path)
122122
df2.to_csv(path, mode='a', header=False)
123-
124123
xp = pd.concat([df1, df2])
125124
rs = pd.read_csv(path, index_col=0)
126125
rs.columns = lmap(int, rs.columns)

pandas/tests/io/formats/test_to_csv.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -564,36 +564,35 @@ def test_to_csv_compression(self, compression_only,
564564

565565
@pytest.mark.parametrize("header, index_label, expected_rows", [
566566
(False, True, ['index.name,,', '0,0,0', '1,0,0']),
567-
(True, True, ['index.name,A,B', '0,0,0', '1,0,0']),
567+
(True, True, ['index.name,0,1', '0,0,0', '1,0,0']),
568568
(False, False, ['0,0,0', '1,0,0']),
569-
(True, False, [',A,B', '0,0,0', '1,0,0']),
569+
(True, False, [',0,1', '0,0,0', '1,0,0']),
570570
(False, None, ['0,0,0', '1,0,0']),
571-
(True, None, ['index.name,A,B', '0,0,0', '1,0,0'])
571+
(True, None, ['index.name,0,1', '0,0,0', '1,0,0'])
572572
])
573573
def test_to_csv_header_single_index(self, header, index_label,
574574
expected_rows):
575575
# issue 24546
576576
df = pd.DataFrame(np.zeros((2, 2), dtype=int))
577577
df.index.name = 'index.name'
578-
df.columns = ['A', 'B']
578+
df.columns.name = 'columns.name'
579579

580580
result = df.to_csv(header=header, index_label=index_label)
581581
expected = tm.convert_rows_list_to_csv_str(expected_rows)
582582
assert result == expected
583583

584584
@pytest.mark.parametrize("header, index_label, expected_rows", [
585585
(False, True, ['index.name.0,index.name.1,,', 'a,b,0,0', 'a,c,0,0']),
586-
(True, True, ['index.name.0,index.name.1,A,B', 'a,b,0,0', 'a,c,0,0']),
586+
(True, True, ['index.name.0,index.name.1,0,1', 'a,b,0,0', 'a,c,0,0']),
587587
(False, False, ['a,b,0,0', 'a,c,0,0']),
588-
(True, False, [',,A,B', 'a,b,0,0', 'a,c,0,0']),
588+
(True, False, [',,0,1', 'a,b,0,0', 'a,c,0,0']),
589589
(False, None, ['a,b,0,0', 'a,c,0,0']),
590-
(True, None, ['index.name.0,index.name.1,A,B', 'a,b,0,0', 'a,c,0,0'])
590+
(True, None, ['index.name.0,index.name.1,0,1', 'a,b,0,0', 'a,c,0,0'])
591591
])
592592
def test_to_csv_header_multi_index(self, header, index_label,
593593
expected_rows):
594594
# issue 24546
595595
df = pd.DataFrame(np.zeros((2, 2), dtype=int))
596-
df.columns = ['A', 'B']
597596
df.index = pd.MultiIndex.from_product([['a'], ['b', 'c']], names=[
598597
'index.name.0', 'index.name.1'])
599598

0 commit comments

Comments
 (0)