Merge pull request #8608 from rneatherway/bugfixes

tacaswell · web-flow · commit 1e53be31b51e · 2017-05-13T17:27:37.000-04:00
FIX: a number of minor local bugs
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -69,7 +69,7 @@ def DEBUG_MSG(string, lvl=3, o=None):
 
 def debug_on_error(type, value, tb):
     """Code due to Thomas Heller - published in Python Cookbook (O'Reilley)"""
-    traceback.print_exc(type, value, tb)
+    traceback.print_exception(type, value, tb)
     print()
     pdb.pm()  # jdh uncomment
 
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -1234,7 +1234,7 @@ def score_size(self, size1, size2):
         try:
             sizeval1 = float(size1)
         except ValueError:
-            sizeval1 = self.default_size * font_scalings(size1)
+            sizeval1 = self.default_size * font_scalings[size1]
         try:
             sizeval2 = float(size2)
         except ValueError:
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -200,7 +200,7 @@ def __init__(self):
             else:
                 mpl.verbose.report('No LaTeX-compatible font found for the '
                                    '%s font family in rcParams. Using '
-                                   'default.' % ff, 'helpful')
+                                   'default.' % font_family, 'helpful')
                 setattr(self, font_family_attr, self.font_info[font_family])
             fontconfig.append(getattr(self, font_family_attr)[0])
         # Add a hash of the latex preamble to self._fontconfig so that the
