Skip to content

Commit 19ca582

Browse files
committed
Removed fail-over to alternate array package on ImportError.
svn path=/trunk/matplotlib/; revision=553
1 parent 78131d2 commit 19ca582

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

lib/matplotlib/numerix.py

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,9 @@
4848
raise ValueError("numerix selector must be either 'Numeric' or 'numarray' but the value obtained from the %s was '%s'." % (which[1], which[0]))
4949

5050
if which[0] == "numarray":
51-
try:
52-
from na_imports import *
53-
except ImportError:
54-
print >>sys.stderr, "numarray import failed... trying Numeric."
55-
which = "numeric", "numarray import error"
56-
from nc_imports import *
51+
from na_imports import *
5752
elif which[0] == "numeric":
58-
try:
59-
from nc_imports import *
60-
except ImportError:
61-
if which[1] != "defaulted":
62-
print >>sys.stderr, "Numeric import failed... trying numarray."
63-
which = "numarray", "Numeric import error"
64-
else:
65-
which = "numarray", "defaulted"
66-
from na_imports import *
53+
from nc_imports import *
6754
else:
6855
raise RuntimeError("invalid numerix selector")
6956

0 commit comments

Comments
 (0)