File tree 3 files changed +19
-10
lines changed
3 files changed +19
-10
lines changed Original file line number Diff line number Diff line change @@ -1663,7 +1663,14 @@ def __repr__(self) -> str:
1663
1663
self , self ._formatter (), indent_for_name = False
1664
1664
).rstrip (", \n " )
1665
1665
class_name = f"<{ type (self ).__name__ } >\n "
1666
- return f"{ class_name } { data } \n Length: { len (self )} , dtype: { self .dtype } "
1666
+ footer = self ._get_repr_footer ()
1667
+ return f"{ class_name } { data } \n { footer } "
1668
+
1669
+ def _get_repr_footer (self ) -> str :
1670
+ # GH#24278
1671
+ if self .ndim > 1 :
1672
+ return f"Shape: { self .shape } , dtype: { self .dtype } "
1673
+ return f"Length: { len (self )} , dtype: { self .dtype } "
1667
1674
1668
1675
def _repr_2d (self ) -> str :
1669
1676
from pandas .io .formats .printing import format_object_summary
@@ -1679,7 +1686,8 @@ def _repr_2d(self) -> str:
1679
1686
]
1680
1687
data = ",\n " .join (lines )
1681
1688
class_name = f"<{ type (self ).__name__ } >"
1682
- return f"{ class_name } \n [\n { data } \n ]\n Shape: { self .shape } , dtype: { self .dtype } "
1689
+ footer = self ._get_repr_footer ()
1690
+ return f"{ class_name } \n [\n { data } \n ]\n { footer } "
1683
1691
1684
1692
def _formatter (self , boxed : bool = False ) -> Callable [[Any ], str | None ]:
1685
1693
"""
Original file line number Diff line number Diff line change @@ -2177,7 +2177,7 @@ def _repr_categories(self) -> list[str]:
2177
2177
category_strs = [x .strip () for x in category_strs ]
2178
2178
return category_strs
2179
2179
2180
- def _repr_categories_info (self ) -> str :
2180
+ def _get_repr_footer (self ) -> str :
2181
2181
"""
2182
2182
Returns a string representation of the footer.
2183
2183
"""
@@ -2229,7 +2229,7 @@ def __repr__(self) -> str:
2229
2229
"""
2230
2230
String representation.
2231
2231
"""
2232
- footer = self ._repr_categories_info ()
2232
+ footer = self ._get_repr_footer ()
2233
2233
length = len (self )
2234
2234
max_len = 10
2235
2235
if length > max_len :
Original file line number Diff line number Diff line change @@ -259,11 +259,12 @@ def _get_footer(self) -> str:
259
259
name = self .series .name
260
260
footer = ""
261
261
262
- if getattr (self .series .index , "freq" , None ) is not None :
263
- assert isinstance (
264
- self .series .index , (DatetimeIndex , PeriodIndex , TimedeltaIndex )
265
- )
266
- footer += f"Freq: { self .series .index .freqstr } "
262
+ index = self .series .index
263
+ if (
264
+ isinstance (index , (DatetimeIndex , PeriodIndex , TimedeltaIndex ))
265
+ and index .freq is not None
266
+ ):
267
+ footer += f"Freq: { index .freqstr } "
267
268
268
269
if self .name is not False and name is not None :
269
270
if footer :
@@ -289,7 +290,7 @@ def _get_footer(self) -> str:
289
290
# level infos are added to the end and in a new line, like it is done
290
291
# for Categoricals
291
292
if isinstance (self .tr_series .dtype , CategoricalDtype ):
292
- level_info = self .tr_series ._values ._repr_categories_info ()
293
+ level_info = self .tr_series ._values ._get_repr_footer ()
293
294
if footer :
294
295
footer += "\n "
295
296
footer += level_info
You can’t perform that action at this time.
0 commit comments