Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

jenshnielsen · jenshnielsen · commit 40bbe6158f5d · 2016-05-23T19:17:53.000+01:00
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -3188,9 +3188,8 @@ def get_justify(colname, column, precision):
         ntype = column.dtype
 
         if np.issubdtype(ntype, str) or np.issubdtype(ntype, bytes):
-            # The division below handles unicode stored in array, which could
-            # have 4 bytes per char
-            length = max(len(colname), column.itemsize // column[0].itemsize)
+            fixed_width = int(ntype.str[2:])
+            length = max(len(colname), fixed_width)
             return 0, length+padding, "%s"  # left justify
 
         if np.issubdtype(ntype, np.int):
diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
@@ -403,10 +403,10 @@ def test_csv2txt_basic(self):
                                      (str('y'), np.int8),
                                      (str('s'), str, 3),
                                      (str('s2'), str, 4)]))
-        truth = ('       x   y   s   s2\n'
-                 '   1.000   2   foo bing \n'
-                 '   2.000   3   bar blah ')
-        assert_equal(mlab.rec2txt(a), truth)
+        truth = ('       x   y   s     s2\n'
+                 '   1.000   2   foo   bing   \n'
+                 '   2.000   3   bar   blah   ').splitlines()
+        assert_equal(mlab.rec2txt(a).splitlines(), truth)
 
 
 class window_testcase(CleanupTestCase):
