Fix import error for new numpy

svn path=/trunk/matplotlib/; revision=2474

Author: teoliphant

CHANGELOG

@@ -1,3 +1,6 @@
+2006-06-12 Updated numerix.fft to handle numpy restructuring
+           Added ImportError to numerix.linear_algebra for numpy -TEO
+
 2006-06-11 Added quiverkey command to pylab and Axes, using
            QuiverKey class in quiver.py.  Changed pylab and Axes
            to use quiver2 if possible, but drop back to the

lib/matplotlib/numerix/fft/__init__.py

@@ -6,5 +6,9 @@
     from FFT import *
 elif which[0] == "numpy":
     from numpy.dft import *
+    try:
+        from numpy.dft.old import *
+    except ImportError:
+        pass
 else:
     raise RuntimeError("invalid numerix selector")

lib/matplotlib/numerix/linear_algebra/__init__.py

@@ -8,7 +8,7 @@
     from numpy.linalg import *
     try:
         from numpy.linalg.old import *
-    except:
+    except ImportError:
         pass
 else:
     raise RuntimeError("invalid numerix selector")