Fix handling of font file matching so that if two different paths point

mdboom · mdboom · commit c8ae4e2b90b4 · 2007-07-11T14:57:13.000Z
to the same file, they are treated as the same file.

svn path=/trunk/matplotlib/; revision=3499
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -21,7 +21,7 @@
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import Bunch, enumerate, is_string_like, reverse_dict
+from matplotlib.cbook import Bunch, enumerate, is_string_like, reverse_dict, get_realpath_and_stat
 from matplotlib.figure import Figure
 from matplotlib.font_manager import fontManager
 from matplotlib.afm import AFM
@@ -455,8 +455,9 @@ def writeFonts(self):
             if filename.endswith('.afm'):
                 fontdictObject = self._write_afm_font(filename)
             else:
+                realpath, stat_key = get_realpath_and_stat(filename)
                 fontdictObject = self.embedTTF(
-                    filename, self.used_characters[filename])
+                    *self.used_characters[stat_key])
             fonts[Fx] = fontdictObject
             #print >>sys.stderr, filename
         self.writeObject(self.fontObject, fonts)
@@ -927,8 +928,10 @@ def track_characters(self, font, s):
             fname = font
         else:
             fname = font.fname
-        used_characters = self.used_characters.setdefault(fname, sets.Set())
-        used_characters.update(s)
+        realpath, stat_key = get_realpath_and_stat(fname)
+        used_characters = self.used_characters.setdefault(
+            stat_key, (realpath, sets.Set()))
+        used_characters[1].update(s)
 
     def draw_arc(self, gcEdge, rgbFace, x, y, width, height,
                  angle1, angle2, rotation):
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -15,7 +15,7 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
 
-from matplotlib.cbook import is_string_like, izip
+from matplotlib.cbook import is_string_like, izip, get_realpath_and_stat
 from matplotlib.figure import Figure
 
 from matplotlib.font_manager import fontManager
@@ -149,9 +149,10 @@ def __init__(self, width, height, pswriter, dpi=72):
     def track_characters(self, font, s):
         """Keeps track of which characters are required from
         each font."""
-        fname = font.fname
-        used_characters = self.used_characters.setdefault(fname, sets.Set())
-        used_characters.update(s)
+        realpath, stat_key = get_realpath_and_stat(font.fname)
+        used_characters = self.used_characters.setdefault(
+            stat_key, (realpath, sets.Set()))
+        used_characters[1].update(s)
 
     def set_color(self, r, g, b, store=1):
         if (r,g,b) != self.color:
@@ -1028,7 +1029,7 @@ def print_figure(self, outfile, dpi=72, facecolor='w', edgecolor='w',
                 for l in d.split('\n'):
                     print >>fh, l.strip()
             if not rcParams['ps.useafm']:
-                for font_filename, chars in renderer.used_characters.items():
+                for font_filename, chars in renderer.used_characters.values():
                     font = FT2Font(font_filename)
                     cmap = font.get_charmap()
                     glyph_ids = []
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -405,6 +405,21 @@ def mkdirs(newdir, mode=0777):
          raise
 
 
+class GetRealpathAndStat:
+    def __init__(self):
+        self._cache = {}
+
+    def __call__(self, path):
+        result = self._cache.get(path)
+        if result is None:
+            realpath = os.path.realpath(path)
+            stat = os.stat(realpath)
+            stat_key = (stat.st_ino, stat.st_dev)
+            result = realpath, stat_key
+            self._cache[path] = result
+        return result
+get_realpath_and_stat = GetRealpathAndStat()
+
 def dict_delall(d, keys):
     'delete all of the keys from the dict d'
     for key in keys:
