diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-08-15 09:58:58 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-08-15 09:58:58 -0700 |
commit | 3c9c31b19038dbe49c145aa014aa45e0b29b5d4c (patch) | |
tree | 935fbe1ee70d979507b4d61f957a4cac26655bb4 /numpy/lib/__init__.py | |
parent | 580a3b60abfb9fa7f9866a87dc90f7bbc6bed184 (diff) | |
parent | dc73e1b104cf59f936e3c2bb5cfc3c0e147f99de (diff) | |
download | numpy-3c9c31b19038dbe49c145aa014aa45e0b29b5d4c.tar.gz |
Merge pull request #3534 from charris/nan-stat-functions
Add nanmean, nanvar, and nanstd functions.
Diffstat (limited to 'numpy/lib/__init__.py')
-rw-r--r-- | numpy/lib/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py index 12acae95b..64a8550c6 100644 --- a/numpy/lib/__init__.py +++ b/numpy/lib/__init__.py @@ -1,11 +1,14 @@ from __future__ import division, absolute_import, print_function +import math + from .info import __doc__ from numpy.version import version as __version__ from .type_check import * from .index_tricks import * from .function_base import * +from .nanfunctions import * from .shape_base import * from .stride_tricks import * from .twodim_base import * @@ -18,7 +21,6 @@ from .utils import * from .arraysetops import * from .npyio import * from .financial import * -import math from .arrayterator import * from .arraypad import * @@ -36,6 +38,7 @@ __all__ += utils.__all__ __all__ += arraysetops.__all__ __all__ += npyio.__all__ __all__ += financial.__all__ +__all__ += nanfunctions.__all__ from numpy.testing import Tester test = Tester().test |