diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2019-09-08 11:23:10 -0700 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@gmail.com> | 2019-09-19 08:57:52 +0200 |
| commit | 9996fb316d7386a0ea3b5f85e71283b3ba9abe55 (patch) | |
| tree | dc72eb2ac6d474e2f55135fe4f1cdb25b1d59c36 /numpy | |
| parent | 53f130751ac488b879adcb9e6bb2e2bc76a4ac93 (diff) | |
| download | numpy-9996fb316d7386a0ea3b5f85e71283b3ba9abe55.tar.gz | |
MAINT: fix issue with `np.lib.mixins.__all__` and import of mixins
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/lib/__init__.py | 4 | ||||
| -rw-r--r-- | numpy/lib/mixins.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py index c1757150e..eb6c9cace 100644 --- a/numpy/lib/__init__.py +++ b/numpy/lib/__init__.py @@ -8,7 +8,7 @@ from numpy.version import version as __version__ from .type_check import * from .index_tricks import * from .function_base import * -from .mixins import * +from . import mixins # public from .nanfunctions import * from .shape_base import * from .stride_tricks import * @@ -18,7 +18,6 @@ from .histograms import * from . import scimath as emath from .polynomial import * -#import convertcode from .utils import * from .arraysetops import * from .npyio import * @@ -32,7 +31,6 @@ __all__ = ['emath', 'math', 'tracemalloc_domain'] __all__ += type_check.__all__ __all__ += index_tricks.__all__ __all__ += function_base.__all__ -__all__ += mixins.__all__ __all__ += shape_base.__all__ __all__ += stride_tricks.__all__ __all__ += twodim_base.__all__ diff --git a/numpy/lib/mixins.py b/numpy/lib/mixins.py index 52ad45b68..f974a7724 100644 --- a/numpy/lib/mixins.py +++ b/numpy/lib/mixins.py @@ -5,8 +5,8 @@ import sys from numpy.core import umath as um -# Nothing should be exposed in the top-level NumPy module. -__all__ = [] + +__all__ = ['NDArrayOperatorsMixin'] def _disables_array_ufunc(obj): |