Merge pull request #3868 from jenshnielsen/font_family_unicode

tacaswell · tacaswell · commit 143973a183fa · 2014-12-12T20:08:48.000-05:00
BUG : Ensure that font family is unicode
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -52,6 +52,7 @@
     set
 except NameError:
     from sets import Set as set
+from collections import Iterable
 import matplotlib
 from matplotlib import afm
 from matplotlib import ft2font
@@ -822,7 +823,9 @@ def set_family(self, family):
         if family is None:
             family = rcParams['font.family']
         if is_string_like(family):
-            family = [family]
+            family = [six.text_type(family)]
+        elif (not is_string_like(family) and isinstance(family, Iterable)):
+            family = [six.text_type(f) for f in family]
         self._family = family
     set_name = set_family
 
