[Numpy-svn] r3806 - in trunk/numpy/core: . src

[numpy-svn at scipy.org]

Author: oliphant
Date: 2007-05-23 13:07:27 -0500 (Wed, 23 May 2007)
New Revision: 3806

Modified:
   trunk/numpy/core/_internal.py
   trunk/numpy/core/src/multiarraymodule.c
Log:
Remove import multiarray from top of _internal.py

Modified: trunk/numpy/core/_internal.py
===================================================================
--- trunk/numpy/core/_internal.py	2007-05-23 12:43:09 UTC (rev 3805)
+++ trunk/numpy/core/_internal.py	2007-05-23 18:07:27 UTC (rev 3806)
@@ -2,7 +2,6 @@
 #  that implements more complicated stuff.
 
 import re
-from multiarray import dtype, ndarray
 import sys
 
 if (sys.byteorder == 'little'):
@@ -11,6 +10,7 @@
     _nbo = '>'
 
 def _makenames_list(adict):
+    from multiarray import dtype
     allfields = []
     fnames = adict.keys()
     for fname in fnames:
@@ -44,6 +44,7 @@
 #  a dictionary without "names" and "formats"
 #  fields is used as a data-type descriptor.
 def _usefields(adict, align):
+    from multiarray import dtype
     try:
         names = adict[-1]
     except KeyError:
@@ -109,6 +110,7 @@
 # so don't remove the name here, or you'll
 # break backward compatibilty.
 def _reconstruct(subtype, shape, dtype):
+    from multiarray import ndarray
     return ndarray.__new__(subtype, shape, dtype)
 
 
@@ -193,6 +195,7 @@
     return result
 
 def _getintp_ctype():
+    from multiarray import dtype
     val = _getintp_ctype.cache
     if val is not None:
         return val

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2007-05-23 12:43:09 UTC (rev 3805)
+++ trunk/numpy/core/src/multiarraymodule.c	2007-05-23 18:07:27 UTC (rev 3806)
@@ -7584,10 +7584,8 @@
 
 	if (set_typeinfo(d) != 0) goto err;
 
-	if (_numpy_internal == NULL) {
-	    _numpy_internal = PyImport_ImportModule("numpy.core._internal");
-	    if (_numpy_internal != NULL) return;
-	}
+        _numpy_internal = PyImport_ImportModule("numpy.core._internal");
+        if (_numpy_internal != NULL) return;
 
  err:
 	if (!PyErr_Occurred()) {