diff options
author | Travis Oliphant <oliphant@enthought.com> | 2006-05-02 23:19:56 +0000 |
---|---|---|
committer | Travis Oliphant <oliphant@enthought.com> | 2006-05-02 23:19:56 +0000 |
commit | f544e777b5124da236b2fb2afefcf310f025042f (patch) | |
tree | 8717c4cccfcf48eb6820f8eba53622ee70a8d5e7 /numpy/lib | |
parent | 45330187562c533df24917c04f40050f81190814 (diff) | |
download | numpy-f544e777b5124da236b2fb2afefcf310f025042f.tar.gz |
Add math module to numpy namespace so numpy.math works same as Numeric.math. Change numpy.math to numpy.nmath
Diffstat (limited to 'numpy/lib')
-rw-r--r-- | numpy/lib/__init__.py | 5 | ||||
-rw-r--r-- | numpy/lib/function_base.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py index f962b13b7..e5778d230 100644 --- a/numpy/lib/__init__.py +++ b/numpy/lib/__init__.py @@ -9,15 +9,16 @@ from shape_base import * from twodim_base import * from ufunclike import * -import scimath as math +import scimath as nmath from polynomial import * from machar import * from getlimits import * #import convertcode from utils import * from arraysetops import * +import math -__all__ = ['math'] +__all__ = ['nmath','math'] __all__ += type_check.__all__ __all__ += index_tricks.__all__ __all__ += function_base.__all__ diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index bb48ae828..6f8df9b7b 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -662,7 +662,7 @@ def cov(m,y=None, rowvar=1, bias=0): is a variable and the observations are in the rows. """ - X = array(m,copy=False,ndmin=2) + X = array(m,ndmin=2) if X.shape[0] == 1: rowvar = 1 if rowvar: |