[Yt-svn] yt-commit r1459 - branches/yt-1.5/yt/raven trunk/yt/raven

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Wed Sep 23 22:42:37 2009
New Revision: 1459
URL: http://yt.spacepope.org/changeset/1459

Log:
Updated for compatibility with Matplotlib-0.99.1.1


Modified:
   branches/yt-1.5/yt/raven/__init__.py
   trunk/yt/raven/__init__.py

Modified: branches/yt-1.5/yt/raven/__init__.py
==============================================================================
--- branches/yt-1.5/yt/raven/__init__.py	(original)
+++ branches/yt-1.5/yt/raven/__init__.py	Wed Sep 23 22:42:37 2009
@@ -67,7 +67,10 @@
 from Callbacks import *
 from FixedResolution import *
 
-color_maps = matplotlib.cm.cmapnames + raven_colormaps.keys()
+if 'cmapnames' in dir(matplotlib.cm):
+    color_maps = matplotlib.cm.cmapnames + raven_colormaps.keys()
+else:
+    color_maps = matplotlib.cm._cmapnames + raven_colormaps.keys()
 default_cmap = ytcfg.get("raven", "colormap")
 if default_cmap != "jet":
     mylog.info("Setting default colormap to %s", default_cmap)

Modified: trunk/yt/raven/__init__.py
==============================================================================
--- trunk/yt/raven/__init__.py	(original)
+++ trunk/yt/raven/__init__.py	Wed Sep 23 22:42:37 2009
@@ -67,7 +67,10 @@
 from Callbacks import *
 from FixedResolution import *
 
-color_maps = matplotlib.cm.cmapnames + raven_colormaps.keys()
+if 'cmapnames' in dir(matplotlib.cm):
+    color_maps = matplotlib.cm.cmapnames + raven_colormaps.keys()
+else:
+    color_maps = matplotlib.cm._cmapnames + raven_colormaps.keys()
 default_cmap = ytcfg.get("raven", "colormap")
 if default_cmap != "jet":
     mylog.info("Setting default colormap to %s", default_cmap)