fix flake8 warnings or ignore them locally (per line) instead of ignoring them per file

simplified code in a few FileHandler.list_items() methods in the process

Author: gdementen

larray/__init__.py

@@ -31,9 +31,8 @@
 from larray.inout.xw_excel import open_excel, Workbook
 from larray.inout.xw_reporting import ExcelReport, ReportSheet
 
-# just make sure handlers for .pkl and .pickle are initialized
+# module is imported only to initialize handlers for .pkl and .pickle (we del _pkl at the end of this module)
 import larray.inout.pickle as _pkl
-del _pkl
 
 from larray.util.options import get_options, set_options
 
@@ -43,8 +42,6 @@
 
 from larray.example import get_example_filepath, load_example_data, EXAMPLE_EXCEL_TEMPLATES_DIR
 
-import larray.random
-
 
 __all__ = [
     # axis
@@ -92,13 +89,13 @@
 
 # ==== DEPRECATED API ====
 
-from larray.core.axis import x
-from larray.core.group import PGroup
-from larray.core.array import (LArray, aslarray, create_sequential, ndrange, larray_equal,
+# F401: imported item not used
+from larray.core.axis import x                                                              # noqa: F401
+from larray.core.group import PGroup                                                        # noqa: F401
+from larray.core.array import (LArray, aslarray, create_sequential, ndrange, larray_equal,  # noqa: F401
                                larray_nan_equal, nan_equal, element_equal)
 
-
-_deprecated = [
+_deprecated_names = [
     # axis
     'x',
     # group
@@ -109,4 +106,7 @@
     'larray_equal', 'larray_nan_equal', 'nan_equal', 'element_equal',
 ]
 
-__all__ += _deprecated
+__all__ += _deprecated_names
+
+# cleanup namespace (module was imported only to initialize handlers for .pkl and .pickle)
+del _pkl

larray/core/array.py

@@ -375,8 +375,8 @@ def _translate_key(self, key):
     def __getitem__(self, key):
         ndim = self.array.ndim
         full_scalar_key = (
-            (isinstance(key, (int, np.integer)) and ndim == 1) or
-            (isinstance(key, tuple) and len(key) == ndim and all(isinstance(k, (int, np.integer)) for k in key))
+            (isinstance(key, (int, np.integer)) and ndim == 1)
+            or (isinstance(key, tuple) and len(key) == ndim and all(isinstance(k, (int, np.integer)) for k in key))
         )
         # fast path when the result is a scalar
         if full_scalar_key:
@@ -388,8 +388,8 @@ def __setitem__(self, key, value):
         array = self.array
         ndim = array.ndim
         full_scalar_key = (
-            (isinstance(key, (int, np.integer)) and ndim == 1) or
-            (isinstance(key, tuple) and len(key) == ndim and all(isinstance(k, (int, np.integer)) for k in key))
+            (isinstance(key, (int, np.integer)) and ndim == 1)
+            or (isinstance(key, tuple) and len(key) == ndim and all(isinstance(k, (int, np.integer)) for k in key))
         )
         # fast path when setting a single cell
         if full_scalar_key:
@@ -652,7 +652,7 @@ def get_axis(obj, i):
 }
 
 
-def _doc_agg_method(func, by=False, long_name='', action_verb='perform', extra_args=[], kwargs=[]):
+def _doc_agg_method(func, by=False, long_name='', action_verb='perform', extra_args=(), kwargs=()):
     if not long_name:
         long_name = func.__name__
 
@@ -800,10 +800,8 @@ class Array(ABCArray):
      11         F   0.0   0.0   0.0
      12         M   0.0   0.0   0.0
      12         F   0.0   0.0   0.0
-    >>> # with metadata (Python <= 3.5)
-    >>> arr = Array(data, axes, meta=[('title', 'my title'), ('author', 'John Smith')])
-    >>> # with metadata (Python 3.6+)
-    >>> arr = Array(data, axes, meta=Metadata(title='my title', author='John Smith'))  # doctest: +SKIP
+    >>> # with metadata
+    >>> arr = Array(data, axes, meta=Metadata(title='my title', author='John Smith'))
 
     Array creation functions
 
@@ -1291,8 +1289,9 @@ def describe(self, *args, **kwargs):
         # when *args is not empty (see https://github.com/larray-project/larray/issues/192)
         # return stack([(~np.isnan(self)).sum(*args), self.mean(*args), self.std(*args),
         #               *self.percentile(percentiles, *args)], Axis(labels, 'stats'))
-        return stack([(~np.isnan(self)).sum(*args), self.mean(*args), self.std(*args)] +
-                     [self.percentile(p, *args) for p in percentiles], Axis(labels, 'statistic'))
+        return stack([(~np.isnan(self)).sum(*args), self.mean(*args), self.std(*args)]
+                     + [self.percentile(p, *args) for p in percentiles],
+                     Axis(labels, 'statistic'))
 
     def describe_by(self, *args, **kwargs):
         r"""
@@ -8504,9 +8503,11 @@ def sequence(axis, initial=0, inc=None, mult=None, func=None, axes=None, title=N
 
     # fast path for the most common case
     integer_types = (int, np.integer)
-    if (isinstance(mult, integer_types) and mult == 1 and
-            isinstance(inc, integer_types) and isinstance(initial, integer_types) and
-            func is None and axes is None):
+    if (isinstance(mult, integer_types) and mult == 1
+            and isinstance(inc, integer_types)
+            and isinstance(initial, integer_types)
+            and func is None
+            and axes is None):
         axis = _make_axis(axis)
         # stop is not included
         stop = initial + inc * len(axis)

larray/core/axis.py

@@ -854,11 +854,13 @@ def isscalar(k):
             list_res = [self[k] for k in key]
             return list_res if isinstance(key, list) else tuple(list_res)
         # allow targeting a label from an aggregated axis with the group which created it
-        elif (not isinstance(self, AxisReference) and
-              isinstance(key, Group) and
-              isinstance(key.axis, Axis) and
-              key.axis.name == self.name and
-              key.name in self):
+        elif (
+            not isinstance(self, AxisReference)
+            and isinstance(key, Group)
+            and isinstance(key.axis, Axis)
+            and key.axis.name == self.name
+            and key.name in self
+        ):
             return LGroup(key.name, None, self)
         # elif isinstance(key, basestring) and key in self:
             # TODO: this is an awful workaround to avoid the "processing" of string keys which exist as is in the axis

larray/inout/csv.py

@@ -298,13 +298,7 @@ def list_items(self):
         # strip extension from files
         # XXX: unsure we should use sorted here
         fnames = sorted([os.path.splitext(fname)[0] for fname in fnames])
-        items = []
-        try:
-            fnames.remove('__metadata__')
-        except:
-            pass
-        items += [(name, 'Array') for name in fnames]
-        return items
+        return [(name, 'Array') for name in fnames if name != '__metadata__']
 
     def _read_item(self, key, type, *args, **kwargs):
         if type == 'Array':

larray/inout/excel.py

@@ -246,14 +246,7 @@ def _open_for_write(self):
         self.handle = pd.ExcelWriter(self.fname, engine=engine)
 
     def list_items(self):
-        sheet_names = self.handle.sheet_names
-        items = []
-        try:
-            sheet_names.remove('__metadata__')
-        except:
-            pass
-        items += [(name, 'Array') for name in sheet_names]
-        return items
+        return [(name, 'Array') for name in self.handle.sheet_names if name != '__metadata__']
 
     def _read_item(self, key, type, *args, **kwargs):
         if type == 'Array':
@@ -308,14 +301,7 @@ def _open_for_write(self):
         self.handle = open_excel(self.fname, overwrite_file=self.overwrite_file)
 
     def list_items(self):
-        sheet_names = self.handle.sheet_names()
-        items = []
-        try:
-            sheet_names.remove('__metadata__')
-        except:
-            pass
-        items += [(name, 'Array') for name in sheet_names]
-        return items
+        return [(name, 'Array') for name in self.handle.sheet_names() if name != '__metadata__']
 
     def _read_item(self, key, type, *args, **kwargs):
         if type == 'Array':

larray/inout/pandas.py

@@ -337,8 +337,8 @@ def df_asarray(df, sort_rows=False, sort_columns=False, raw=False, parse_header=
             return from_series(series, sort_rows=sort_columns, **kwargs)
 
     # handle 1D arrays
-    if len(df) == 1 and (pd.isnull(df.index.values[0]) or
-                         (isinstance(df.index.values[0], str) and df.index.values[0].strip() == '')):
+    if len(df) == 1 and (pd.isnull(df.index.values[0])
+                         or (isinstance(df.index.values[0], str) and df.index.values[0].strip() == '')):
         if parse_header:
             df.columns = pd.Index([parse(cell) for cell in df.columns.values], name=df.columns.name)
         series = df.iloc[0]
@@ -363,6 +363,6 @@ def parse_axis_name(name):
     # make them roundtrip correctly, based on the assumption that in an in-memory LArray an anonymouse axis is more
     # likely and useful than an Axis with an empty name.
     # TODO : find a more robust and elegant solution
-    res = res.rename({axis: None for axis in res.axes if isinstance(axis.name, str) and
-                      (axis.name == '' or 'Unnamed:' in axis.name)})
+    res = res.rename({axis: None for axis in res.axes if (isinstance(axis.name, str)
+                                                          and (axis.name == '' or 'Unnamed:' in axis.name))})
     return res

larray/inout/xw_excel.py

@@ -25,15 +25,13 @@
     from xlwings.constants import FileFormat
     global_app = None
 
-
     def is_app_alive(app):
         try:
             app.books
             return True
         except Exception:
             return False
 
-
     def kill_global_app():
         global global_app
 
@@ -46,7 +44,6 @@ def kill_global_app():
             del global_app
             global_app = None
 
-
     class ArrayConverter(PandasDataFrameConverter):
         writes_types = Array
 
@@ -71,9 +68,8 @@ def _disable_screen_updates(app):
         # unsure we can safely do this
         # xl_app.EnableEvents = False
 
-
-    # TODO: replace overwrite_file by mode='r'|'w'|'a' the day xlwings will support a read-only mode
     class Workbook(object):
+        # TODO: replace overwrite_file by mode='r'|'w'|'a' the day xlwings will support a read-only mode
         def __init__(self, filepath=None, overwrite_file=False, visible=None, silent=None, app=None, load_addins=None):
             global global_app
 
@@ -322,7 +318,6 @@ def __repr__(self):
             cls = self.__class__
             return f'<{cls.__module__}.{cls.__name__} [{self.name}]>'
 
-
     def _fill_slice(s, length):
         r"""
         replaces a slice None bounds by actual bounds.
@@ -340,7 +335,6 @@ def _fill_slice(s, length):
         """
         return slice(s.start if s.start is not None else 0, s.stop if s.stop is not None else length, s.step)
 
-
     def _concrete_key(key, obj, ndim=2):
         r"""Expand key to ndim and replace None in slices start/stop bounds by 0 or obj.shape[corresponding_dim]
         respectively.
@@ -372,7 +366,6 @@ def _concrete_key(key, obj, ndim=2):
         return [_fill_slice(k, length) if isinstance(k, slice) else k
                 for k, length in zip(key, shape)]
 
-
     class Sheet(object):
         def __init__(self, workbook, key, xw_sheet=None):
             if xw_sheet is None:
@@ -515,7 +508,6 @@ def __repr__(self):
             xw_sheet = self.xw_sheet
             return f'<{cls.__module__}.{cls.__name__} [{xw_sheet.book.name}]{xw_sheet.name}>'
 
-
     class Range(object):
         def __init__(self, sheet, *args):
             xw_range = sheet.xw_sheet.range(*args)
@@ -618,7 +610,6 @@ def load(self, header=True, convert_float=True, nb_axes=None, index_col=None, fi
             else:
                 return Array(list_data)
 
-
     # XXX: deprecate this function?
     def open_excel(filepath=None, overwrite_file=False, visible=None, silent=None, app=None, load_addins=None):
         return Workbook(filepath, overwrite_file=overwrite_file, visible=visible, silent=silent, app=app,