diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-07-26 16:38:32 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-07-26 16:38:32 +0000 |
| commit | c47dfadf925b567ad0ff7dc0331afa8247160240 (patch) | |
| tree | 5eb60a60b5d3f09361da752d5d44f234a3db46ca /numpy/lib/convertcode.py | |
| parent | f44b6859c241129bedad7a223edf221646b30e04 (diff) | |
| parent | 5508e33853b909315b0cc4f12e4daba5f2e767a6 (diff) | |
| download | numpy-c47dfadf925b567ad0ff7dc0331afa8247160240.tar.gz | |
Merge changes from ver1.0 branch.
Diffstat (limited to 'numpy/lib/convertcode.py')
| -rw-r--r-- | numpy/lib/convertcode.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/lib/convertcode.py b/numpy/lib/convertcode.py index b70f83a33..b9352cd43 100644 --- a/numpy/lib/convertcode.py +++ b/numpy/lib/convertcode.py @@ -31,7 +31,6 @@ flatindex_re = re.compile('([.]flat(\s*?[[=]))') # Not very safe. Disabled for now.. def replacetypechars(astr): astr = astr.replace("'s'","'h'") - astr = astr.replace("'c'","'S1'") astr = astr.replace("'b'","'B'") astr = astr.replace("'1'","'b'") astr = astr.replace("'w'","'H'") @@ -108,7 +107,7 @@ def fromstr(filestr): 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, 'FFT', 'numpy.dft.old') filestr, fromall3 = changeimports(filestr, 'MA', 'numpy.core.ma') fromall = fromall1 or fromall2 or fromall3 filestr = replaceattr(filestr) |