diff options
Diffstat (limited to 'numpy/lib/convertnumericA.py')
| -rw-r--r-- | numpy/lib/convertnumericA.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/numpy/lib/convertnumericA.py b/numpy/lib/convertnumericA.py index 446d81e3d..ad1daa329 100644 --- a/numpy/lib/convertnumericA.py +++ b/numpy/lib/convertnumericA.py @@ -73,21 +73,21 @@ import datetime def fromstr(filestr): #filestr = replacetypechars(filestr) filestr, fromall1 = changeimports(filestr, 'Numeric', 'numpy.oldnumeric') - filestr, fromall1 = changeimports(filestr, 'multiarray', - 'numpy.core.multiarray') - filestr, fromall1 = changeimports(filestr, 'umath', - 'numpy.core.umath') - filestr, fromall1 = changeimports(filestr, 'Precision', 'numpy.oldnumeric') - filestr, fromall2 = changeimports(filestr, 'numerix', 'numpy') - filestr, fromall3 = changeimports(filestr, 'scipy_base', 'numpy') - filestr, fromall3 = changeimports(filestr, 'MLab', 'numpy.lib.mlab') - filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', - 'numpy.linalg.old') - filestr, fromall3 = changeimports(filestr, 'RNG', 'numpy.random.oldrng') - filestr, fromall3 = changeimports(filestr, 'RNG.Statistics', 'numpy.random.oldrngstats') - filestr, fromall3 = changeimports(filestr, 'RandomArray', 'numpy.random.oldrandomarray') - filestr, fromall3 = changeimports(filestr, 'FFT', 'numpy.dft.old') - filestr, fromall3 = changeimports(filestr, 'MA', 'numpy.core.ma') + filestr, fromall1 = changeimports(filestr, 'multiarray','numpy.oldnumeric') + filestr, fromall1 = changeimports(filestr, 'umath', 'numpy.oldnumeric') + filestr, fromall1 = changeimports(filestr, 'Precision', 'numpy.oldnumeric.precision') + filestr, fromall1 = changeimports(filestr, 'UserArray', 'numpy.oldnumeric.user_array') + filestr, fromall1 = changeimports(filestr, 'ArrayPrinter', 'numpy.oldnumeric.array_printer') + filestr, fromall2 = changeimports(filestr, 'numerix', 'numpy.oldnumeric') + filestr, fromall3 = changeimports(filestr, 'scipy_base', 'numpy.oldnumeric') + filestr, fromall3 = changeimports(filestr, 'Matrix', 'numpy.oldnumeric.matrix') + filestr, fromall3 = changeimports(filestr, 'MLab', 'numpy.oldnumeric.mlab') + filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'numpy.oldnumeric.linear_algebra') + filestr, fromall3 = changeimports(filestr, 'RNG', 'numpy.oldnumeric.rng') + filestr, fromall3 = changeimports(filestr, 'RNG.Statistics', 'numpy.oldnumeric.rng_stats') + filestr, fromall3 = changeimports(filestr, 'RandomArray', 'numpy.oldnumeric.random_array') + filestr, fromall3 = changeimports(filestr, 'FFT', 'numpy.oldnumeric.fft') + filestr, fromall3 = changeimports(filestr, 'MA', 'numpy.oldnumeric.ma') fromall = fromall1 or fromall2 or fromall3 filestr = replaceattr(filestr) filestr = replaceother(filestr) |