'SC'

Steve Chaplin · Steve Chaplin · commit d08d3393baf5 · 2005-09-14T13:58:23.000Z
svn path=/trunk/matplotlib/; revision=1751
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,16 +1,17 @@
 New entries should be added at the top
 
+2005-09-14 font_manager.py: removed chkfontpath from x11FontDirectory() - SC
+
 2005-09-14 Factored out auto date locator/formatter factory code into
            matplotlib.date.date_ticker_factory
 
-2005-09-13 Added Mark's axes positions history patch #1286915 
+2005-09-13 Added Mark's axes positions history patch #1286915
 
 2005-09-09 Added support for auto canvas resizing with
            fig.set_figsize_inches(9,5,forward=True) # inches
            OR
            fig.resize(400,300)  # pixels
 
-
 2005-09-07 figure.py: update Figure.draw() to use the updated
            renderer.draw_image() so that examples/figimage_demo.py works again.
            examples/stock_demo.py: remove data_clipping (which no longer
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -62,10 +62,11 @@
 X11FontDirectories  = [
     # what seems to be the standard installation point
     "/usr/X11R6/lib/X11/fonts/TTF/",
+    # documented as a good place to install new fonts...
+    "/usr/share/fonts/",
     # common application, not really useful
     "/usr/lib/openoffice/share/fonts/truetype/",
-    # documented as a good place to install new fonts...
-    "/usr/share/fonts/"]
+    ]
 
 OSXFontDirectories = [
     "/Library/Fonts/",
@@ -164,24 +165,17 @@ def OSXInstalledFonts(directory=None, fontext=None):
 
 def x11FontDirectory():
     """Return the system font directories for X11."""
+    fontpaths = []
+    def add(arg,directory,files):
+        fontpaths.append(directory)
 
-    chkfont = '/usr/sbin/chkfontpath'
-    if os.path.isfile(chkfont):
-        fontpaths = os.popen(chkfont).readlines()
-        return [p.split(':')[1].strip() for p in fontpaths if \
-                p.find(': /') >= 0]
-    else:
-        fontpaths = []
-        #def add(arg, directory, files):
-        def add(arg,directory,files):
-            fontpaths.append(directory)
-        for fontdir in X11FontDirectories:
-            try:
-                if os.path.isdir(fontdir):
-                    os.path.walk(fontdir, add, None)
-            except (IOError, OSError, TypeError, ValueError):
-                pass
-        return fontpaths
+    for fontdir in X11FontDirectories:
+        try:
+            if os.path.isdir(fontdir):
+                os.path.walk(fontdir, add, None)
+        except (IOError, OSError, TypeError, ValueError):
+            pass
+    return fontpaths
 
 def findSystemFonts(fontpaths=None, fontext='ttf'):
 
