[Scipy-svn] r6280 - trunk/scipy

[scipy-svn at scipy.org]

Author: cdavid
Date: 2010-03-29 20:57:21 -0500 (Mon, 29 Mar 2010)
New Revision: 6280

Modified:
   trunk/scipy/__init__.py
Log:
PY3K: make top __init__ py3-compatible.

Modified: trunk/scipy/__init__.py
===================================================================
--- trunk/scipy/__init__.py	2010-03-30 01:57:14 UTC (rev 6279)
+++ trunk/scipy/__init__.py	2010-03-30 01:57:21 UTC (rev 6280)
@@ -107,13 +107,13 @@
 __all__.remove('linalg')
 
 try:
-    from __config__ import show as show_config
-except ImportError, e:
+    from scipy.__config__ import show as show_config
+except ImportError:
     msg = """Error importing scipy: you cannot import scipy while
     being in scipy source directory; please exit the scipy source
     tree first, and relaunch your python intepreter."""
     raise ImportError(msg)
-from version import version as __version__
+from scipy.version import version as __version__
 
 # Load scipy packages and their global_symbols
 from numpy._import_tools import PackageLoader