Skip to content

Commit c0d0955

Browse files
set index_label to False when header is False
1 parent 435968d commit c0d0955

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

pandas/io/formats/csvs.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ def __init__(self, obj, path_or_buf=None, sep=",", na_rep='',
5151
self.header = header
5252
self.index = index
5353
self.index_label = index_label
54+
if not (self.header or self.index_label):
55+
self.index_label = False
5456
self.mode = mode
5557
if encoding is None:
5658
encoding = 'ascii' if compat.PY2 else 'utf-8'

pandas/tests/frame/test_to_csv.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def test_to_csv_from_csv3(self):
119119
df2 = DataFrame(np.random.randn(3, 1))
120120

121121
df1.to_csv(path)
122-
df2.to_csv(path, mode='a', header=False, index_label=False)
122+
df2.to_csv(path, mode='a', header=False)
123123

124124
xp = pd.concat([df1, df2])
125125
rs = pd.read_csv(path, index_col=0)
@@ -765,7 +765,7 @@ def test_to_csv_wide_frame_formatting(self):
765765
# Issue #8621
766766
df = DataFrame(np.random.randn(1, 100010), columns=None, index=None)
767767
with ensure_clean() as filename:
768-
df.to_csv(filename, header=False, index=False, index_label=False)
768+
df.to_csv(filename, header=False, index=False)
769769
rs = read_csv(filename, header=None)
770770
assert_frame_equal(rs, df)
771771

pandas/tests/io/formats/test_to_csv.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_to_csv_with_single_column(self):
3030
1.0
3131
"""
3232
with tm.ensure_clean('test.csv') as path:
33-
df1.to_csv(path, header=None, index=None, index_label=False)
33+
df1.to_csv(path, header=None, index=None)
3434
with open(path, 'r') as f:
3535
assert f.read() == expected1
3636

@@ -40,7 +40,7 @@ def test_to_csv_with_single_column(self):
4040
""
4141
"""
4242
with tm.ensure_clean('test.csv') as path:
43-
df2.to_csv(path, header=None, index=None, index_label=False)
43+
df2.to_csv(path, header=None, index=None)
4444
with open(path, 'r') as f:
4545
assert f.read() == expected2
4646

@@ -490,7 +490,7 @@ def test_to_csv_write_to_open_file(self):
490490
with tm.ensure_clean('test.txt') as path:
491491
with open(path, 'w') as f:
492492
f.write('manual header\n')
493-
df.to_csv(f, header=None, index=None, index_label=False)
493+
df.to_csv(f, header=None, index=None)
494494
with open(path, 'r') as f:
495495
assert f.read() == expected
496496

@@ -507,7 +507,7 @@ def test_to_csv_write_to_open_file_with_newline_py3(self):
507507
with tm.ensure_clean('test.txt') as path:
508508
with open(path, 'w', newline='') as f:
509509
f.write('manual header\n')
510-
df.to_csv(f, header=None, index=None, index_label=False)
510+
df.to_csv(f, header=None, index=None)
511511

512512
with open(path, 'rb') as f:
513513
assert f.read() == bytes(expected, 'utf-8')
@@ -525,7 +525,7 @@ def test_to_csv_write_to_open_file_with_newline_py2(self):
525525
with tm.ensure_clean('test.txt') as path:
526526
with open(path, 'wb') as f:
527527
f.write('manual header\n')
528-
df.to_csv(f, header=None, index=None, index_label=False)
528+
df.to_csv(f, header=None, index=None)
529529

530530
with open(path, 'rb') as f:
531531
assert f.read() == expected

pandas/tests/series/test_io.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ def test_to_csv_deprecation(self, arg, datetime_series):
4949
# see gh-19715
5050
with ensure_clean() as path:
5151
if arg == "path":
52-
kwargs = dict(path=path, header=False, index_label=False)
52+
kwargs = dict(path=path, header=False)
5353
elif arg == "header":
54-
kwargs = dict(path_or_buf=path, index_label=False)
54+
kwargs = dict(path_or_buf=path)
5555
else: # Both discrepancies match.
56-
kwargs = dict(path=path, index_label=False)
56+
kwargs = dict(path=path)
5757

5858
with tm.assert_produces_warning(FutureWarning):
5959
datetime_series.to_csv(**kwargs)
@@ -65,7 +65,7 @@ def test_to_csv_deprecation(self, arg, datetime_series):
6565
def test_from_csv(self, datetime_series, string_series):
6666

6767
with ensure_clean() as path:
68-
datetime_series.to_csv(path, header=False, index_label=False)
68+
datetime_series.to_csv(path, header=False)
6969
ts = self.read_csv(path)
7070
assert_series_equal(datetime_series, ts, check_names=False)
7171

@@ -82,7 +82,7 @@ def test_from_csv(self, datetime_series, string_series):
8282
ts_h = self.read_csv(path, header=0)
8383
assert ts_h.name == "ts"
8484

85-
string_series.to_csv(path, header=False, index_label=False)
85+
string_series.to_csv(path, header=False)
8686
series = self.read_csv(path)
8787
assert_series_equal(string_series, series, check_names=False)
8888

@@ -109,22 +109,21 @@ def test_to_csv(self, datetime_series):
109109
import io
110110

111111
with ensure_clean() as path:
112-
datetime_series.to_csv(path, header=False, index_label=False)
112+
datetime_series.to_csv(path, header=False)
113113

114114
with io.open(path, newline=None) as f:
115115
lines = f.readlines()
116116
assert (lines[1] != '\n')
117117

118-
datetime_series.to_csv(path, index=False, header=False,
119-
index_label=False)
118+
datetime_series.to_csv(path, index=False, header=False)
120119
arr = np.loadtxt(path)
121120
assert_almost_equal(arr, datetime_series.values)
122121

123122
def test_to_csv_unicode_index(self):
124123
buf = StringIO()
125124
s = Series([u("\u05d0"), "d2"], index=[u("\u05d0"), u("\u05d1")])
126125

127-
s.to_csv(buf, encoding="UTF-8", header=False, index_label=False)
126+
s.to_csv(buf, encoding="UTF-8", header=False)
128127
buf.seek(0)
129128

130129
s2 = self.read_csv(buf, index_col=0, encoding="UTF-8")
@@ -134,8 +133,7 @@ def test_to_csv_float_format(self):
134133

135134
with ensure_clean() as filename:
136135
ser = Series([0.123456, 0.234567, 0.567567])
137-
ser.to_csv(filename, float_format="%.2f", header=False,
138-
index_label=False)
136+
ser.to_csv(filename, float_format="%.2f", header=False)
139137

140138
rs = self.read_csv(filename)
141139
xp = Series([0.12, 0.23, 0.57])
@@ -154,7 +152,7 @@ def test_to_csv_path_is_none(self):
154152
# Series.to_csv() was returning None, inconsistent with
155153
# DataFrame.to_csv() which returned string
156154
s = Series([1, 2, 3])
157-
csv_str = s.to_csv(path_or_buf=None, header=False, index_label=False)
155+
csv_str = s.to_csv(path_or_buf=None, header=False)
158156
assert isinstance(csv_str, str)
159157

160158
@pytest.mark.parametrize('s,encoding', [

0 commit comments

Comments
 (0)