summaryrefslogtreecommitdiff
path: root/numpy/lib/__init__.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-05-02 23:19:56 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-05-02 23:19:56 +0000
commitf544e777b5124da236b2fb2afefcf310f025042f (patch)
tree8717c4cccfcf48eb6820f8eba53622ee70a8d5e7 /numpy/lib/__init__.py
parent45330187562c533df24917c04f40050f81190814 (diff)
downloadnumpy-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/__init__.py')
-rw-r--r--numpy/lib/__init__.py5
1 files changed, 3 insertions, 2 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__