Merged revisions 4786-4800 via svnmerge from

mdboom · mdboom · commit b2b5397ba6da · 2008-01-04T14:59:50.000Z
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib ........ r4788 | efiring | 2007-12-26 02:23:27 -0500 (Wed, 26 Dec 2007) | 7 lines Make numerix.ma and numerix.npyma work with numpy 1.05 The numpy maskedarray branch is scheduled to become the trunk for 1.05. It includes a change from ma.py being in numpy/core to ma being a module under numpy, so the import syntax is different in numerix.ma and numerix.npyma. ........ r4789 | efiring | 2007-12-26 02:51:19 -0500 (Wed, 26 Dec 2007) | 2 lines Fix bug in errorbar, reported by Noriko Minakawa ........ r4790 | efiring | 2007-12-26 12:10:34 -0500 (Wed, 26 Dec 2007) | 2 lines Warning instead of exception if matplotlib.use() is called too late. ........ svn path=/branches/transforms/; revision=4801
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,12 @@
+2007-12-26 Reduce too-late use of matplotlib.use() to a warning
+           instead of an exception, for backwards compatibility - EF
+
+2007-12-25 Fix bug in errorbar, identified by Noriko Minakawa - EF
+
+2007-12-25 Changed masked array importing to work with the upcoming
+           numpy 1.05 (now the maskedarray branch) as well as with
+           earlier versions. - EF
+
 2007-12-16 rec2csv saves doubles without losing precision. Also, it
            does not close filehandles passed in open. - JDH,ADS
 
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -727,8 +727,11 @@ def rcdefaults():
     except:
         from config import rcParams, rcdefaults
 
-_use_error_msg = """ matplotlib.use() must be called *before* pylab
-or matplotlib.backends is imported for the first time."""
+_use_error_msg = """ This call to matplotlib.use() has no effect
+because the the backend has already been chosen;
+matplotlib.use() must be called *before* pylab, matplotlib.pyplot,
+or matplotlib.backends is imported for the first time.
+"""
 
 def use(arg):
     """
@@ -747,7 +750,7 @@ def use(arg):
     be called before importing matplotlib.backends.
     """
     if 'matplotlib.backends' in sys.modules:
-        raise RuntimeError(_use_error_msg)
+        warnings.warn(_use_error_msg)
     be_parts = arg.split('.')
     name = validate_backend(be_parts[0])
     rcParams['backend'] = name
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -3779,6 +3779,8 @@ def errorbar(self, x, y, yerr=None, xerr=None,
             lines_kw['linewidth']=kwargs['linewidth']
         if 'lw' in kwargs:
             lines_kw['lw']=kwargs['lw']
+        if 'transform' in kwargs:
+            lines_kw['transform'] = kwargs['transform']
 
         # arrays fine here, they are booleans and hence not units
         if not iterable(lolims):
@@ -3814,6 +3816,8 @@ def xywhere(xs, ys, mask):
                 plot_kw['markeredgewidth']=kwargs['markeredgewidth']
             if 'mew' in kwargs:
                 plot_kw['mew']=kwargs['mew']
+            if 'transform' in kwargs:
+                plot_kw['transform'] = kwargs['transform']
 
         if xerr is not None:
             if iterable(xerr) and len(xerr)==2 and iterable(xerr[0]) and iterable(xerr[1]):
diff --git a/lib/matplotlib/numerix/ma/__init__.py b/lib/matplotlib/numerix/ma/__init__.py
@@ -13,7 +13,10 @@
         from maskedarray import *
         print "using maskedarray"
     else:
-        from numpy.core.ma import *
+        try:
+            from numpy.ma import *        # numpy 1.05 and later
+        except ImportError:
+            from numpy.core.ma import *   # earlier
         #print "using ma"
     def getmaskorNone(obj):
         _msk = getmask(obj)
diff --git a/lib/matplotlib/numerix/npyma/__init__.py b/lib/matplotlib/numerix/npyma/__init__.py
@@ -4,5 +4,8 @@
     from maskedarray import *
     print "using maskedarray"
 else:
-    from numpy.core.ma import *
+    try:
+        from numpy.ma import *        # numpy 1.05 and later
+    except ImportError:
+        from numpy.core.ma import *   # earlier
     #print "using ma"
