Merge pull request #9522 from matplotlib/auto-backport-of-pr-9504

tacaswell · web-flow · commit 4d797c7c97b5 · 2017-10-22T17:41:15.000-04:00
Backport PR #9504 on branch v2.1.x
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -226,15 +226,17 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
             local = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, fontdir)
         except OSError:
             continue
-
         if not local:
             return list_fonts(directory, fontext)
         try:
             for j in range(winreg.QueryInfoKey(local)[1]):
                 try:
-                    key, direc, any = winreg.EnumValue( local, j)
+                    key, direc, tp = winreg.EnumValue(local, j)
                     if not isinstance(direc, six.string_types):
                         continue
+                    # Work around for https://bugs.python.org/issue25778, which
+                    # is fixed in Py>=3.6.1.
+                    direc = direc.split("\0", 1)[0]
                     if not os.path.dirname(direc):
                         direc = os.path.join(directory, direc)
                     direc = os.path.abspath(direc).lower()
