From 6768d24e4709c080d0ed5c7dca1f36f759fa8ba2 Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Fri, 9 Jun 2006 23:52:23 +0000 Subject: Add RNG interface and clean up old-interfaces to be separate from newer ones. --- numpy/lib/convertcode.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'numpy/lib/convertcode.py') diff --git a/numpy/lib/convertcode.py b/numpy/lib/convertcode.py index 67a98cb1d..d45bd2fe3 100644 --- a/numpy/lib/convertcode.py +++ b/numpy/lib/convertcode.py @@ -98,13 +98,14 @@ def fromstr(filestr): 'numpy.core.umath') filestr, fromall1 = changeimports(filestr, 'Precision', 'numpy') filestr, fromall2 = changeimports(filestr, 'numerix', 'numpy') - filestr, fromall3 = changeimports(filestr, 'numpy_base', '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') - filestr, fromall3 = changeimports(filestr, 'RandomArray', 'numpy.random') - filestr, fromall3 = changeimports(filestr, 'FFT', 'numpy.dft') + 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.oldfft') filestr, fromall3 = changeimports(filestr, 'MA', 'numpy.core.ma') fromall = fromall1 or fromall2 or fromall3 filestr = replaceattr(filestr) -- cgit v1.2.1