updated references to mpl data directories for py2exe

ddale · ddale · commit c1134bd71e09 · 2007-12-06T19:18:49.000Z
svn path=/trunk/matplotlib/; revision=4654
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2007-12-06 updated references to mpl data directories for py2exe - DSD
+
 2007-12-06 fixed a bug in rcsetup, see bug 1845057 - DSD
 
 ===============================================================
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -428,11 +428,16 @@ def _get_data_path():
 
     # py2exe zips pure python, so still need special check
     if getattr(sys,'frozen',None):
-        path = os.path.join(os.path.split(sys.path[0])[0], 'matplotlibdata')
+        path = os.path.join(os.path.split(sys.path[0])[0], 'mpl-data')
+        if os.path.isdir(path): return path
+        else:
+            # Try again assuming we need to step up one more directory
+            path = os.path.join(os.path.split(os.path.split(sys.path[0])[0])[0],
+                                'mpl-data')
         if os.path.isdir(path): return path
         else:
             # Try again assuming sys.path[0] is a dir not a exe
-            path = os.path.join(sys.path[0], 'matplotlibdata')
+            path = os.path.join(sys.path[0], 'mpl-data')
             if os.path.isdir(path): return path
 
     raise RuntimeError('Could not find the matplotlib data files')
@@ -442,7 +447,8 @@ def _get_data_path_cached():
         defaultParams['datapath'][0] = _get_data_path()
     return defaultParams['datapath'][0]
 
-get_data_path = verbose.wrap('matplotlib data path %s', _get_data_path_cached, always=False)
+get_data_path = verbose.wrap('matplotlib data path %s', _get_data_path_cached,
+                             always=False)
 
 def get_py2exe_datafiles():
     datapath = get_data_path()
@@ -454,8 +460,8 @@ def get_py2exe_datafiles():
         if 'Matplotlib.nib' in files:
             files.remove('Matplotlib.nib')
         files = [os.path.join(root, filename) for filename in files]
-        root = root.replace(tail, 'matplotlibdata')
-        root = root[root.index('matplotlibdata'):]
+        root = root.replace(tail, 'mpl-data')
+        root = root[root.index('mpl-data'):]
         d[root] = files
     return d.items()
 
diff --git a/lib/matplotlib/config/cutils.py b/lib/matplotlib/config/cutils.py
@@ -77,7 +77,7 @@ def _get_configdir():
     if os.path.exists(p):
         if not is_writable_dir(p):
             raise RuntimeError("""\
-'%s' is not a writable dir; you must set %s/.matplotlib to be a writable dir. 
+'%s' is not a writable dir; you must set %s/.matplotlib to be a writable dir.
 You can also set environment variable MPLCONFIGDIR to any writable directory
 where you want matplotlib data stored """%h)
     else:
@@ -110,11 +110,16 @@ def _get_data_path():
 
     # py2exe zips pure python, so still need special check
     if getattr(sys,'frozen',None):
-        path = os.path.join(os.path.split(sys.path[0])[0], 'matplotlibdata')
+        path = os.path.join(os.path.split(sys.path[0])[0], 'mpl-data')
+        if os.path.isdir(path): return path
+        else:
+            # Try again assuming we need to step up one more directory
+            path = os.path.join(os.path.split(os.path.split(sys.path[0])[0])[0],
+                                'mpl-data')
         if os.path.isdir(path): return path
         else:
             # Try again assuming sys.path[0] is a dir not a exe
-            path = os.path.join(sys.path[0], 'matplotlibdata')
+            path = os.path.join(sys.path[0], 'mpl-data')
             if os.path.isdir(path): return path
 
     raise RuntimeError('Could not find the matplotlib data files')
@@ -136,8 +141,8 @@ def get_py2exe_datafiles():
         if 'Matplotlib.nib' in files:
             files.remove('Matplotlib.nib')
         files = [os.path.join(root, filename) for filename in files]
-        root = root.replace(tail, 'matplotlibdata')
-        root = root[root.index('matplotlibdata'):]
+        root = root.replace(tail, 'mpl-data')
+        root = root[root.index('mpl-data'):]
         d[root] = files
     return d.items()
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2007-12-06 updated references to mpl data directories for py2exe - DSD`
	`2`	`+`
`1`	`3`	`2007-12-06 fixed a bug in rcsetup, see bug 1845057 - DSD`
`2`	`4`
`3`	`5`	`===============================================================`