diff --git a/THANKS.txt b/THANKS.txt index 83e744b85515..bb7db7ee6629 100644 --- a/THANKS.txt +++ b/THANKS.txt @@ -6,7 +6,7 @@ Perry Greenfield, J Todd Miller, Rick White, Paul Barrett for Numarray Paul Dubois for Masked Arrays Pearu Peterson for f2py and distutils and help with code organization Robert Kern for mtrand, bug fixes, help with distutils, and code organization -Eric Jones for weave and other sundry subroutines +Eric Jones for sundry subroutines Fernando Perez for code snippets, ideas, bufixes, and testing. John Hunter for code snippets (from matplotlib) Chris Hanley for help with records.py, testing, and bug fixes. diff --git a/numpy/core/numerictypes.py b/numpy/core/numerictypes.py index 81d80c73fcf4..9d5f9d8b3b41 100644 --- a/numpy/core/numerictypes.py +++ b/numpy/core/numerictypes.py @@ -41,7 +41,7 @@ generic bool_ - numeric + number integer signedinteger (intxx) byte diff --git a/numpy/lib/convertcode.py b/numpy/lib/convertcode.py index 6e590fa25279..3ae0843e6b54 100644 --- a/numpy/lib/convertcode.py +++ b/numpy/lib/convertcode.py @@ -95,10 +95,10 @@ def fromstr(filestr): 'numpy.core.multiarray') filestr, fromall1 = changeimports(filestr, 'umath', 'numpy.core.umath') - filestr, fromall1 = changeimports(filestr, 'Precision', 'numpy.core') - filestr, fromall2 = changeimports(filestr, 'numerix', 'numpy.core') - filestr, fromall3 = changeimports(filestr, 'numpy_base', 'numpy.core') - filestr, fromall3 = changeimports(filestr, 'MLab', 'numpy.core.mlab') + filestr, fromall1 = changeimports(filestr, 'Precision', 'numpy') + filestr, fromall2 = changeimports(filestr, 'numerix', 'numpy') + filestr, fromall3 = changeimports(filestr, 'numpy_base', 'numpy') + filestr, fromall3 = changeimports(filestr, 'MLab', 'numpy.lib.mlab') filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'numpy.linalg') filestr, fromall3 = changeimports(filestr, 'RNG', 'numpy.random') filestr, fromall3 = changeimports(filestr, 'RandomArray', 'numpy.random')