summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scipy/__init__.py4
-rw-r--r--scipy/base/convertcode.py4
-rw-r--r--scipy/random/__init__.py (renamed from scipy/stats/__init__.py)0
3 files changed, 4 insertions, 4 deletions
diff --git a/scipy/__init__.py b/scipy/__init__.py
index feb09f903..614a5c244 100644
--- a/scipy/__init__.py
+++ b/scipy/__init__.py
@@ -13,8 +13,8 @@ try: # For installation purposes only
import scipy.linalg as linalg
import scipy.fftpack as fftpack
from scipy.fftpack import fft, ifft
- import scipy.stats as stats
- from scipy.stats import rand, randn
+ import scipy.random as random
+ from scipy.random import rand, randn
from core_version import version as __version__
from scipy.test.testing import ScipyTest
test = ScipyTest('scipy').test
diff --git a/scipy/base/convertcode.py b/scipy/base/convertcode.py
index a63ea83d7..9ff2c31a9 100644
--- a/scipy/base/convertcode.py
+++ b/scipy/base/convertcode.py
@@ -122,8 +122,8 @@ def fromstr(filestr):
filestr, fromall3 = changeimports(filestr, 'scipy_base', 'scipy.base')
filestr, fromall3 = changeimports(filestr, 'MLab', 'scipy.linalg')
filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'scipy.linalg')
- filestr, fromall3 = changeimports(filestr, 'RNG', 'scipy.stats')
- filestr, fromall3 = changeimports(filestr, 'RandomArray', 'scipy.stats')
+ filestr, fromall3 = changeimports(filestr, 'RNG', 'scipy.random')
+ filestr, fromall3 = changeimports(filestr, 'RandomArray', 'scipy.random')
filestr, fromall3 = changeimports(filestr, 'FFT', 'scipy.fftpack')
filestr, fromall3 = changeimports(filestr, 'MA', 'scipy.base.ma')
fromall = fromall1 or fromall2 or fromall3
diff --git a/scipy/stats/__init__.py b/scipy/random/__init__.py
index 90cbd5cc7..90cbd5cc7 100644
--- a/scipy/stats/__init__.py
+++ b/scipy/random/__init__.py