Skip to content

Commit 041d4df

Browse files
committed
fix name=True bug
1 parent e1476a9 commit 041d4df

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

doc/source/whatsnew/v1.1.2.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Bug fixes
2626
~~~~~~~~~
2727
- Bug in :meth:`DataFrame.eval` with ``object`` dtype column binary operations (:issue:`35794`)
2828
- Bug in :meth:`DataFrame.apply` with ``result_type="reduce"`` returning with incorrect index (:issue:`35683`)
29-
-
29+
- Bug in :meth:`DateTimeIndex.format` and :meth:`PeriodIndex.format` with ``name=True`` setting the first item to ``"None"`` where it should bw ``""`` (:issue:`35712`)
3030
-
3131

3232
.. ---------------------------------------------------------------------------

pandas/core/indexes/datetimelike.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,11 @@ def format(
354354
"""
355355
header = []
356356
if name:
357-
fmt_name = ibase.pprint_thing(self.name, escape_chars=("\t", "\r", "\n"))
358-
header.append(fmt_name)
357+
header.append(
358+
ibase.pprint_thing(self.name, escape_chars=("\t", "\r", "\n"))
359+
if self.name is not None
360+
else ""
361+
)
359362

360363
if formatter is not None:
361364
return header + list(self.map(formatter))

pandas/core/indexes/range.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def _format_data(self, name=None):
189189

190190
def _format_with_header(self, header: List[str], na_rep: str = "NaN") -> List[str]:
191191
if len(self._range) == 0:
192-
return []
192+
return header
193193
first_val_str = str(self._range[0])
194194
last_val_str = str(self._range[-1])
195195
max_length = max(len(first_val_str), len(last_val_str))

pandas/tests/indexes/common.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,9 @@ def test_format(self):
683683

684684
def test_format_empty(self):
685685
# GH35712
686-
assert self._holder([]).format() == []
686+
empty_idx = self._holder([])
687+
assert empty_idx.format() == []
688+
assert empty_idx.format(name=True) == [""]
687689

688690
def test_hasnans_isnans(self, index):
689691
# GH 11343, added tests for hasnans / isnans

pandas/tests/indexes/period/test_period.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,9 @@ def test_contains_raise_error_if_period_index_is_in_multi_index(self, msg, key):
538538

539539
def test_format_empty(self):
540540
# GH35712
541-
assert self._holder([], freq="A").format() == []
541+
empty_idx = self._holder([], freq="A")
542+
assert empty_idx.format() == []
543+
assert empty_idx.format(name=True) == [""]
542544

543545

544546
def test_maybe_convert_timedelta():

pandas/tests/indexes/ranges/test_range.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -524,4 +524,6 @@ def test_engineless_lookup(self):
524524

525525
def test_format_empty(self):
526526
# GH35712
527-
assert self._holder(0).format() == []
527+
empty_idx = self._holder(0)
528+
assert empty_idx.format() == []
529+
assert empty_idx.format(name=True) == [""]

0 commit comments

Comments
 (0)