summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-01-05 00:16:33 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-01-05 00:16:33 +0000
commit6a0653c0eabcc39a1a45565fc9dd21857c465aba (patch)
treea05ac9c71337d996648fc03189a8ff3c2ce9c676
parente74ea102831a608086fdd155101158ab19a24c2c (diff)
downloadnumpy-6a0653c0eabcc39a1a45565fc9dd21857c465aba.tar.gz
Fixes to convertcode.py
-rw-r--r--THANKS.txt2
-rw-r--r--numpy/core/numerictypes.py2
-rw-r--r--numpy/lib/convertcode.py8
3 files changed, 6 insertions, 6 deletions
diff --git a/THANKS.txt b/THANKS.txt
index 83e744b85..bb7db7ee6 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 81d80c73f..9d5f9d8b3 100644
--- a/numpy/core/numerictypes.py
+++ b/numpy/core/numerictypes.py
@@ -41,7 +41,7 @@ Exported symbols include:
generic
bool_
- numeric
+ number
integer
signedinteger (intxx)
byte
diff --git a/numpy/lib/convertcode.py b/numpy/lib/convertcode.py
index 6e590fa25..3ae0843e6 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')