diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-08-31 11:12:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 11:12:33 -0500 |
| commit | f36d2d4d3f622f7901e3d5ade13e04fc05062948 (patch) | |
| tree | f610d44fb3d5baeabf2f3581dc502a52b46e6dd8 /numpy/core/numeric.py | |
| parent | 44d3b5976d55d028e85c075933837dff150d9840 (diff) | |
| parent | 03e08148eb303c7799a18db78b8087f78e5cc2fc (diff) | |
| download | numpy-f36d2d4d3f622f7901e3d5ade13e04fc05062948.tar.gz | |
Merge pull request #10915 from mattip/implement-nep-0015
ENH: implement nep 0015: merge multiarray and umath
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 6c9baef0a..1b4818b76 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -2914,10 +2914,7 @@ True_ = bool_(True) def extend_all(module): existing = set(__all__) - try: - mall = getattr(module, '__all__') - except AttributeError: - mall = [k for k in module.__dict__.keys() if not k.startswith('_')] + mall = getattr(module, '__all__') for a in mall: if a not in existing: __all__.append(a) |