BUG: more #680 fixes

Author: adamklein

pandas/core/format.py

@@ -179,10 +179,11 @@ def to_string(self):
         to_write = []
 
         if len(frame.columns) == 0 or len(frame.index) == 0:
-            info_line = 'Empty %s\nColumns: %s\nIndex: %s'
-            to_write.append(info_line % (type(self.frame).__name__,
-                                         repr(frame.columns),
-                                         repr(frame.index)))
+            info_line = ('Empty %s\nColumns: %s\nIndex: %s' 
+                         % (type(self.frame).__name__, 
+                            repr(frame.columns), 
+                            repr(frame.index)))
+            to_write.append(info_line)
         else:
             # may include levels names also
             str_index = self._get_formatted_index()

pandas/core/index.py

@@ -121,6 +121,14 @@ def summary(self):
         name = type(self).__name__
         return '%s: %s entries%s' % (name, len(self), index_summary)
 
+    def __repr__(self):
+        try:
+            return np.array_repr(self.values)
+        except UnicodeError:
+            return np.array_repr(np.array(
+                        [x if not isinstance(x, basestring) else unicode(x)
+                         for x in self.values]))
+
     @property
     def values(self):
         return np.asarray(self)

pandas/core/series.py

@@ -569,7 +569,7 @@ def _tidy_repr(self, max_vals=20):
                                                   length=False,
                                                   name=False)
         result = head + '\n...\n' + tail
-        namestr = "Name: %s, " % str(self.name) if self.name else ""
+        namestr = "Name: %s, " % str(unicode(self.name)) if self.name else ""
         result = '%s\n%sLength: %d' % (result, namestr, len(self))
         return result
 

pandas/tests/test_frame.py

@@ -1836,10 +1836,16 @@ def test_to_string_unicode_columns(self):
         df.info(buf=buf)
         buf.getvalue()
 
+    def test_to_string_unicode_two(self):
+        dm = DataFrame({u'c/\u03c3': []})
+        buf = StringIO()
+        dm.to_string(buf)
+
     def test_to_string_with_formatters_unicode(self):
         df = DataFrame({u'c/\u03c3':[1,2,3]})
         result = df.to_string(formatters={u'c/\u03c3': lambda x: '%s' % x})
-        self.assertEqual(result, '  c/\xcf\x83\n0 1   \n1 2   \n2 3   ')
+        assert(result in ('  c/\xcf\x83\n0 1   \n1 2   \n2 3   ',
+                          '  c/?\n0 1   \n1 2   \n2 3   ' ))
 
     def test_head_tail(self):
         assert_frame_equal(self.frame.head(), self.frame[:5])