SF.net SVN: matplotlib: [5137] trunk/matplotlib

[<md...@us...>]

Revision: 5137
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5137&view=rev
Author:   mdboom
Date:     2008-05-14 06:52:22 -0700 (Wed, 14 May 2008)

Log Message:
-----------
Merged revisions 5135-5136 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint

........
r5136 | mdboom | 2008-05-14 08:59:46 -0400 (Wed, 14 May 2008) | 2 lines

Fix font embedding on Windows.

........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/cbook.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/v0_91_maint:1-5134
   + /branches/v0_91_maint:1-5136

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-05-14 12:59:46 UTC (rev 5136)
+++ trunk/matplotlib/CHANGELOG	2008-05-14 13:52:22 UTC (rev 5137)
@@ -1,3 +1,5 @@
+2008-05-14 Don't use stat on Windows (fixes font embedding problem) - MGD
+
 2008-05-09 Fix /singlequote (') in Postscript backend - MGD
 
 2008-05-08 Fix kerning in SVG when embedding character outlines - MGD

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py	2008-05-14 12:59:46 UTC (rev 5136)
+++ trunk/matplotlib/lib/matplotlib/cbook.py	2008-05-14 13:52:22 UTC (rev 5137)
@@ -413,8 +413,11 @@
         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)
+            if sys.platform == 'win32':
+                stat_key = realpath
+            else:
+                stat = os.stat(realpath)
+                stat_key = (stat.st_ino, stat.st_dev)
             result = realpath, stat_key
             self._cache[path] = result
         return result


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.