fixed #737 : cleanup modules namespaces

Author: alixdamman

larray/__init__.py

@@ -1,11 +1,97 @@
 from __future__ import absolute_import, division, print_function
 
-from larray.core import *
-from larray.inout import *
-from larray.util import *
-from larray.example import *
-from larray.extra import *
-from larray.viewer import *
+__version__ = '0.30-dev'
+
+
+from larray.core.axis import Axis, AxisCollection, X
+from larray.core.group import Group, LGroup, LSet, IGroup, union
+from larray.core.array import (LArray, zeros, zeros_like, ones, ones_like, empty, empty_like, full,
+                               full_like, sequence, labels_array, ndtest, aslarray, identity, diag,
+                               eye, all, any, sum, prod, cumsum, cumprod, min, max, mean, ptp, var,
+                               std, median, percentile, stack)
+from larray.core.session import Session, local_arrays, global_arrays, arrays
+from larray.core.constants import nan, inf, pi, e, euler_gamma
+from larray.core.metadata import Metadata
+from larray.core.ufuncs import maximum, minimum, where
+from larray.core.npufuncs import (sin, cos, tan, arcsin, arccos, arctan, hypot, arctan2, degrees,
+                                  radians, unwrap, sinh, cosh, tanh, arcsinh, arccosh, arctanh,
+                                  angle, real, imag, conj,
+                                  round, around, round_, rint, fix, floor, ceil, trunc,
+                                  exp, expm1, exp2, log, log10, log2, log1p, logaddexp, logaddexp2,
+                                  i0, sinc, signbit, copysign, frexp, ldexp,
+                                  convolve, clip, sqrt, absolute, fabs, sign, fmax, fmin, nan_to_num,
+                                  real_if_close, interp, isnan, isinf, inverse)
+
+from larray.inout.misc import from_lists, from_string
+from larray.inout.pandas import from_frame, from_series
+from larray.inout.csv import read_csv, read_tsv, read_eurostat
+from larray.inout.excel import read_excel
+from larray.inout.hdf import read_hdf
+from larray.inout.sas import read_sas
+from larray.inout.xw_excel import open_excel, Workbook
+
+from larray.viewer import view, edit, compare
+
+from larray.extra.ipfp import ipfp
+
+from larray.example import get_example_filepath, load_example_data
+
 import larray.random
 
-__version__ = '0.30-dev'
+
+__all__ = [
+    # axis
+    'Axis', 'AxisCollection', 'X',
+    # group
+    'Group', 'LGroup', 'LSet', 'IGroup', 'union',
+    # array
+    'LArray', 'zeros', 'zeros_like', 'ones', 'ones_like', 'empty', 'empty_like', 'full',
+    'full_like', 'sequence', 'labels_array', 'ndtest', 'aslarray', 'identity', 'diag', 'eye',
+    'all', 'any', 'sum', 'prod', 'cumsum', 'cumprod', 'min', 'max', 'mean', 'ptp', 'var', 'std',
+    'median', 'percentile', 'stack',
+    # session
+    'Session', 'local_arrays', 'global_arrays', 'arrays',
+    # constants
+    'nan', 'inf', 'pi', 'e', 'euler_gamma',
+    # metadata
+    'Metadata',
+    # ufuncs
+    'maximum', 'minimum', 'where',
+    'sin', 'cos', 'tan', 'arcsin', 'arccos', 'arctan', 'hypot', 'arctan2', 'degrees', 'radians',
+    'unwrap', 'sinh', 'cosh', 'tanh', 'arcsinh', 'arccosh', 'arctanh',
+    'angle', 'real', 'imag', 'conj',
+    'round', 'around', 'round_', 'rint', 'fix', 'floor', 'ceil', 'trunc',
+    'exp', 'expm1', 'exp2', 'log', 'log10', 'log2', 'log1p', 'logaddexp', 'logaddexp2',
+    'i0', 'sinc', 'signbit', 'copysign', 'frexp', 'ldexp',
+    'convolve', 'clip', 'sqrt', 'absolute', 'fabs', 'sign', 'fmax', 'fmin', 'nan_to_num',
+    'real_if_close', 'interp', 'isnan', 'isinf', 'inverse',
+    # inout
+    'from_lists', 'from_string', 'from_frame', 'from_series', 'read_csv', 'read_tsv',
+    'read_eurostat', 'read_excel', 'read_hdf', 'read_sas', 'open_excel', 'Workbook',
+    # viewer
+    'view', 'edit', 'compare',
+    # ipfp
+    'ipfp',
+    # example
+    'get_example_filepath', 'load_example_data',
+]
+
+
+# ==== DEPRECATED API ====
+
+from larray.core.axis import x
+from larray.core.group import PGroup
+from larray.core.array import (create_sequential, ndrange, larray_equal, larray_nan_equal,
+                               nan_equal, element_equal)
+
+
+_deprecated = [
+    # axis
+    'x',
+    # group
+    'PGroup',
+    # array
+    'create_sequential', 'ndrange', 'larray_equal', 'larray_nan_equal', 'nan_equal', 'element_equal',
+]
+
+__all__ += _deprecated

larray/core/__init__.py

@@ -1,10 +0,0 @@
-from __future__ import absolute_import, division, print_function
-
-from larray.core.constants import *
-from larray.core.group import *
-from larray.core.axis import *
-from larray.core.array import *
-from larray.core.session import *
-from larray.core.ufuncs import *
-from larray.core.npufuncs import *
-from larray.core.metadata import *

larray/core/array.py

@@ -67,15 +67,6 @@
                               renamed_to, deprecate_kwarg, LHDFStore, lazy_attribute)
 
 
-_deprecated = ['create_sequential', 'ndrange', 'larray_equal', 'larray_nan_equal', 'nan_equal', 'element_equal']
-
-__all__ = [
-    'LArray', 'zeros', 'zeros_like', 'ones', 'ones_like', 'empty', 'empty_like', 'full', 'full_like', 'sequence',
-    'labels_array', 'ndtest', 'aslarray', 'identity', 'diag', 'eye', 'all', 'any', 'sum', 'prod', 'cumsum',
-    'cumprod', 'min', 'max', 'mean', 'ptp', 'var', 'std', 'median', 'percentile', 'stack',
-] + _deprecated
-
-
 def all(values, axis=None):
     """
     Test whether all array elements along a given axis evaluate to True.
@@ -5335,7 +5326,7 @@ def eq(self, other, rtol=0, atol=0, nans_equal=False):
             if not nans_equal:
                 return self == other
             else:
-                from larray.core import isnan
+                from larray.core.npufuncs import isnan
 
                 def general_isnan(a):
                     if np.issubclass_(a.dtype.type, np.inexact):
@@ -6049,7 +6040,7 @@ def clip(self, a_min, a_max, out=None):
         -----
         If `a_min` and/or `a_max` are array_like, broadcast will occur between self, `a_min` and `a_max`.
         """
-        from larray.core import clip
+        from larray.core.npufuncs import clip
         return clip(self, a_min, a_max, out)
 
     @deprecate_kwarg('transpose', 'wide')

larray/core/axis.py

@@ -18,10 +18,6 @@
 from larray.util.misc import (basestring, PY2, unicode, long, duplicates, array_lookup2, ReprString, index_by_id,
                               renamed_to, common_type, LHDFStore, lazy_attribute, _isnoneslice)
 
-_deprecated = ['x']
-
-__all__ = ['Axis', 'AxisCollection', 'X'] + _deprecated
-
 
 class Axis(ABCAxis):
     """

larray/core/constants.py

@@ -2,7 +2,6 @@
 
 import numpy as np
 
-__all__ = ['nan', 'inf', 'pi', 'e', 'euler_gamma']
 
 nan = np.nan
 r"NaN (Not a Number)"

larray/core/group.py

@@ -15,10 +15,6 @@
 from larray.util.misc import (basestring, PY2, unique, find_closing_chr, _parse_bound, _seq_summary, _isintstring,
                               renamed_to, LHDFStore)
 
-_deprecated = ['PGroup']
-
-__all__ = ['Group', 'LGroup', 'LSet', 'IGroup', 'union'] + _deprecated
-
 
 def _slice_to_str(key, repr_func=str):
     """

larray/core/metadata.py

@@ -5,9 +5,6 @@
 from larray.util.misc import PY2, basestring
 
 
-__all__ = ['Metadata']
-
-
 if PY2:
     class AttributeDict(object):
         def __init__(self, *args, **kwargs):

larray/core/npufuncs.py

@@ -6,47 +6,6 @@
 from larray.core.ufuncs import broadcastify
 
 
-__all__ = [
-    # Trigonometric functions
-    'sin', 'cos', 'tan', 'arcsin', 'arccos', 'arctan', 'hypot', 'arctan2', 'degrees', 'radians', 'unwrap',
-    # 'deg2rad', 'rad2deg',
-
-    # Hyperbolic functions
-    'sinh', 'cosh', 'tanh', 'arcsinh', 'arccosh', 'arctanh',
-
-    # Rounding
-    'round', 'around', 'round_', 'rint', 'fix', 'floor', 'ceil', 'trunc',
-
-    # Sums, products, differences
-    # 'prod', 'sum', 'nansum', 'cumprod', 'cumsum',
-
-    # cannot use a simple wrapped ufunc because those ufuncs do not preserve shape or dimensions so labels are wrong
-    # 'diff', 'ediff1d', 'gradient', 'cross', 'trapz',
-
-    # Exponents and logarithms
-    'exp', 'expm1', 'exp2', 'log', 'log10', 'log2', 'log1p', 'logaddexp', 'logaddexp2',
-
-    # Other special functions
-    'i0', 'sinc',
-
-    # Floating point routines
-    'signbit', 'copysign', 'frexp', 'ldexp',
-
-    # Arithmetic operations
-    # 'add', 'reciprocal', 'negative', 'multiply', 'divide', 'power', 'subtract', 'true_divide', 'floor_divide',
-    # 'fmod', 'mod', 'modf', 'remainder',
-
-    # Handling complex numbers
-    'angle', 'real', 'imag', 'conj',
-
-    # Miscellaneous
-    'convolve', 'clip', 'sqrt',
-    # 'square',
-    'absolute', 'fabs', 'sign', 'fmax', 'fmin', 'nan_to_num', 'real_if_close',
-    'interp', 'isnan', 'isinf', 'inverse',
-]
-
-
 # Trigonometric functions
 
 sin = broadcastify(np.sin)

larray/core/ufuncs.py

@@ -6,9 +6,6 @@
 from larray.core.array import LArray, raw_broadcastable
 
 
-__all__ = ['maximum', 'minimum', 'where']
-
-
 def broadcastify(func):
     # intentionally not using functools.wraps, because it does not work for wrapping a function from another module
     def wrapper(*args, **kwargs):

larray/example.py

@@ -1,7 +1,6 @@
 import os
 import larray as la
 
-__all__ = ['get_example_filepath', 'load_example_data']
 
 EXAMPLE_FILES_DIR = os.path.dirname(__file__) + '/tests/data/'
 AVAILABLE_EXAMPLE_DATA = {

larray/extra/__init__.py

@@ -1,3 +0,0 @@
-from __future__ import absolute_import
-
-from larray.extra.ipfp import *

larray/extra/ipfp.py

@@ -4,8 +4,6 @@
 from larray.core.array import LArray, aslarray, ones, any
 import numpy as np
 
-__all__ = ['ipfp']
-
 
 def badvalues(a, bad_filter):
     bad_values = a[bad_filter]

larray/inout/__init__.py

@@ -1,10 +0,0 @@
-from __future__ import absolute_import, division, print_function
-
-from larray.inout.pandas import *
-from larray.inout.csv import *
-from larray.inout.misc import *
-from larray.inout.excel import *
-from larray.inout.hdf import *
-from larray.inout.sas import *
-from larray.inout.pickle import *
-from larray.inout.xw_excel import *

larray/inout/csv.py

@@ -21,9 +21,6 @@
 from larray.example import get_example_filepath
 
 
-__all__ = ['read_csv', 'read_tsv', 'read_eurostat']
-
-
 @deprecate_kwarg('nb_index', 'nb_axes', arg_converter=lambda x: x + 1)
 def read_csv(filepath_or_buffer, nb_axes=None, index_col=None, sep=',', headersep=None, fill_value=nan,
              na=nan, sort_rows=False, sort_columns=False, wide=True, dialect='larray', **kwargs):

larray/inout/hdf.py

@@ -17,9 +17,6 @@
 from larray.example import get_example_filepath
 
 
-__all__ = ['read_hdf']
-
-
 def read_hdf(filepath_or_buffer, key, fill_value=nan, na=nan, sort_rows=False, sort_columns=False,
              name=None, **kwargs):
     """Reads an axis or group or array named key from a HDF5 file in filepath (path+name)

larray/inout/misc.py

@@ -10,9 +10,6 @@
 from larray.inout.csv import read_csv
 
 
-__all__ = ['from_lists', 'from_string']
-
-
 @deprecate_kwarg('nb_index', 'nb_axes', arg_converter=lambda x: x + 1)
 def from_lists(data, nb_axes=None, index_col=None, fill_value=nan, sort_rows=False, sort_columns=False, wide=True):
     """

larray/inout/pandas.py

@@ -13,9 +13,6 @@
 from larray.util.misc import basestring, decode, unique
 
 
-__all__ = ['from_frame', 'from_series']
-
-
 def parse(s):
     """
     Used to parse the "folded" axis ticks (usually periods).

larray/inout/pickle.py

@@ -12,9 +12,6 @@
 from larray.inout.common import FileHandler
 
 
-__all__ = []
-
-
 @register_file_handler('pickle', ['pkl', 'pickle'])
 class PickleHandler(FileHandler):
     def _open_for_read(self):

larray/inout/sas.py

@@ -10,9 +10,6 @@
 from larray.util.misc import deprecate_kwarg
 
 
-__all__ = ['read_sas']
-
-
 @deprecate_kwarg('nb_index', 'nb_axes', arg_converter=lambda x: x + 1)
 def read_sas(filepath, nb_axes=None, index_col=None, fill_value=nan, na=nan, sort_rows=False, sort_columns=False,
              **kwargs):

larray/inout/xw_excel.py

@@ -19,9 +19,6 @@
 from larray.util.misc import PY2, deprecate_kwarg
 
 
-__all__ = ['open_excel', 'Workbook']
-
-
 string_types = (str,)
 
 

larray/random.py

@@ -25,10 +25,12 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import numpy as np
 
-from larray.core import Axis, AxisCollection, LArray, aslarray, stack, ndtest
+from larray.core.axis import Axis, AxisCollection
+from larray.core.array import LArray, aslarray, stack, ndtest
 from larray.core.array import raw_broadcastable
 import larray as la
 
+
 __all__ = ['randint', 'normal', 'uniform', 'permutation', 'choice']
 
 

setup.cfg

@@ -14,8 +14,10 @@ addopts = -v --doctest-modules --ignore=larray/core/npufuncs.py --ignore=larray/
 # E202: whitespace before ']'
 # E241: multiple spaces after ','
 # E303: too many blank lines
+# E402 module level import not at top of file
 # E712: comparison to True should be 'if cond is True:' or 'if cond:'
 pep8ignore =
+     __init__.py E402
      xw_excel.py E303
      test_*.py E127 E122 E201 E202 E241 E712
 pep8maxlinelength = 120