From 621c0a6d49e369c5813a2d89d73a6e81093d9f54 Mon Sep 17 00:00:00 2001 From: Julian Taylor Date: Thu, 19 Jun 2014 13:19:59 +0200 Subject: MAINT: move star imports to end of numeric.py allows static analysis (e.g. pyflakes) to detect undefined names --- numpy/core/numeric.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'numpy/core/numeric.py') diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index a85e8514c..12e690f1e 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -6,9 +6,11 @@ import warnings import collections from . import multiarray from . import umath -from .umath import * +from .umath import (invert, sin, UFUNC_BUFSIZE_DEFAULT, ERR_IGNORE, + ERR_WARN, ERR_RAISE, ERR_CALL, ERR_PRINT, ERR_LOG, + ERR_DEFAULT, PINF, NAN) from . import numerictypes -from .numerictypes import * +from .numerictypes import longlong, intc, int_, float_, complex_, bool_ if sys.version_info[0] >= 3: import pickle @@ -356,9 +358,6 @@ def extend_all(module): if a not in adict: __all__.append(a) -extend_all(umath) -extend_all(numerictypes) - newaxis = None @@ -2832,6 +2831,10 @@ nan = NaN = NAN False_ = bool_(False) True_ = bool_(True) +from .umath import * +from .numerictypes import * from . import fromnumeric from .fromnumeric import * extend_all(fromnumeric) +extend_all(umath) +extend_all(numerictypes) -- cgit v1.2.1