Skip to content

Commit 17d9c12

Browse files
author
y-p
committed
ENH: SeriesFormatter footer repr now uses pprint_thing()
fixes #2051
1 parent 11dff0d commit 17d9c12

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

pandas/core/format.py

+5-14
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def __init__(self, series, buf=None, header=True, length=True,
7272
self.float_format = float_format
7373

7474
def _get_footer(self):
75-
footer = ''
75+
footer = u''
7676

7777
if self.name:
7878
if getattr(self.series.index, 'freq', None):
@@ -81,24 +81,15 @@ def _get_footer(self):
8181
if footer and self.series.name:
8282
footer += ', '
8383

84-
if self.series.name:
85-
if isinstance(self.series.name, basestring):
86-
series_name = self.series.name
87-
elif isinstance(self.series.name, tuple):
88-
series_name = "('%s')" % "', '".join(self.series.name)
89-
else:
90-
series_name = str(self.series.name)
91-
else:
92-
series_name = self.series.name
93-
94-
footer += (("Name: %s" % series_name)
95-
if series_name is not None else '')
84+
series_name = com.pprint_thing(self.series.name)
85+
footer += ("Name: %s" % series_name) if self.series.name is not None else ""
9686

9787
if self.length:
9888
if footer:
9989
footer += ', '
10090
footer += 'Length: %d' % len(self.series)
101-
return footer
91+
92+
return unicode(footer)
10293

10394
def _get_formatted_index(self):
10495
index = self.series.index

pandas/core/series.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ def _tidy_repr(self, max_vals=20):
861861
return '%s\n%s' % (result, self._repr_footer())
862862

863863
def _repr_footer(self):
864-
namestr = "Name: %s, " % str(self.name) if self.name is not None else ""
864+
namestr = "Name: %s, " % com.pprint_thing(self.name) if self.name is not None else ""
865865
return '%sLength: %d' % (namestr, len(self))
866866

867867
def to_string(self, buf=None, na_rep='NaN', float_format=None,

0 commit comments

Comments
 (0)