@@ -186,16 +186,11 @@ def list_fonts(directory, extensions):
186186 recursively under the directory.
187187 """
188188 extensions = ["." + ext for ext in extensions ]
189- if sys .platform == 'win32' and directory == win32FontDirectory ():
190- return [os .path .join (directory , filename )
191- for filename in os .listdir (directory )
192- if os .path .isfile (os .path .join (directory , filename ))]
193- else :
194- return [os .path .join (dirpath , filename )
195- # os.walk ignores access errors, unlike Path.glob.
196- for dirpath , _ , filenames in os .walk (directory )
197- for filename in filenames
198- if Path (filename ).suffix .lower () in extensions ]
189+ return [os .path .join (dirpath , filename )
190+ # os.walk ignores access errors, unlike Path.glob.
191+ for dirpath , _ , filenames in os .walk (directory )
192+ for filename in filenames
193+ if Path (filename ).suffix .lower () in extensions ]
199194
200195
201196def win32FontDirectory ():
@@ -275,7 +270,7 @@ def findSystemFonts(fontpaths=None, fontext='ttf'):
275270 if fontpaths is None :
276271 if sys .platform == 'win32' :
277272 installed_fonts = _get_win32_installed_fonts ()
278- fontpaths = MSUserFontDirectories + [ win32FontDirectory () ]
273+ fontpaths = [ ]
279274 else :
280275 installed_fonts = _get_fontconfig_fonts ()
281276 if sys .platform == 'darwin' :
0 commit comments