File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -226,15 +226,17 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
226226 local = winreg .OpenKey (winreg .HKEY_LOCAL_MACHINE , fontdir )
227227 except OSError :
228228 continue
229-
230229 if not local :
231230 return list_fonts (directory , fontext )
232231 try :
233232 for j in range (winreg .QueryInfoKey (local )[1 ]):
234233 try :
235- key , direc , any = winreg .EnumValue ( local , j )
234+ key , direc , tp = winreg .EnumValue (local , j )
236235 if not isinstance (direc , six .string_types ):
237236 continue
237+ # Work around for https://bugs.python.org/issue25778, which
238+ # is fixed in Py>=3.6.1.
239+ direc = direc .split ("\0 " , 1 )[0 ]
238240 if not os .path .dirname (direc ):
239241 direc = os .path .join (directory , direc )
240242 direc = os .path .abspath (direc ).lower ()
You can’t perform that action at this time.
0 commit comments