CLN: for Python 3+, we can define classes without inheriting from object

Author: gdementen

larray/core/array.py

@@ -305,7 +305,7 @@ def concat(arrays, axis=0, dtype=None):
     return result
 
 
-class ArrayIterator(object):
+class ArrayIterator:
     __slots__ = ('__next__',)
 
     def __init__(self, array):
@@ -326,7 +326,7 @@ def __iter__(self):
 
 # TODO: rename to ArrayIndexIndexer or something like that
 # TODO: the first slice in the example below should be documented
-class ArrayPositionalIndexer(object):
+class ArrayPositionalIndexer:
     r"""
     Allows selection of a subset using indices of labels.
 
@@ -409,7 +409,7 @@ def __iter__(self):
             return ArrayIterator(array)
 
 
-class ArrayPointsIndexer(object):
+class ArrayPointsIndexer:
     r"""
     Allows selection of arbitrary items in the array based on their N-dimensional label index.
 
@@ -460,7 +460,7 @@ def __setitem__(self, key, value):
 #     >>> arr.iflat[:4]
 #     a_b  a0_b0  a0_b1  a0_b2  a1_b0
 #              0     10     20     30
-class ArrayFlatIndicesIndexer(object):
+class ArrayFlatIndicesIndexer:
     r"""
     Access the array by index as if it was flat (one dimensional) and all its axes were combined.
 
@@ -531,7 +531,7 @@ def __len__(self):
 # TODO: show that we need to use a "full slice" for leaving the dimension alone
 # TODO: document explicitly that axes should be in the correct order and missing axes should be slice None
 # (except at the end)
-class ArrayPositionalPointsIndexer(object):
+class ArrayPositionalPointsIndexer:
     r"""
     Allows selection of arbitrary items in the array based on their N-dimensional index.
 

larray/core/axis.py

@@ -1474,7 +1474,7 @@ def _make_axis(obj):
 # not using OrderedDict because it does not support indices-based getitem
 # not using namedtuple because we have to know the fields in advance (it is a one-off class) and we need more
 # functionality than just a named tuple
-class AxisCollection(object):
+class AxisCollection:
     __slots__ = ('_list', '_map')
     r"""
     Represents a collection of axes.
@@ -3665,7 +3665,7 @@ def evaluate(self, context):
     __hash__ = object.__hash__
 
 
-class AxisReferenceFactory(object):
+class AxisReferenceFactory:
     # needed to make pickle work (because we have a __getattr__ which does not return AttributeError on __getstate__)
     def __getstate__(self):
         return self.__dict__
@@ -3683,7 +3683,7 @@ def __getitem__(self, key):
 X = AxisReferenceFactory()
 
 
-class DeprecatedAxisReferenceFactory(object):
+class DeprecatedAxisReferenceFactory:
     # needed to make pickle work (because we have a __getattr__ which does not return AttributeError on __getstate__)
     def __getstate__(self):
         return self.__dict__

larray/core/expr.py

@@ -1,7 +1,7 @@
 import sys
 
 
-class ExprNode(object):
+class ExprNode:
     # method factory
     def _binop(opname):
         def opmethod(self, other):

larray/core/group.py

@@ -700,7 +700,7 @@ def union(*args):
         return []
 
 
-class IGroupMaker(object):
+class IGroupMaker:
     r"""
     Generates a new instance of IGroup for a given axis and key.
 
@@ -730,7 +730,7 @@ def __len__(self):
 
 # We need a separate class for LGroup and cannot simply create a new Axis with a subset of values/ticks/labels:
 # the subset of ticks/labels of the LGroup need to correspond to its *Axis* indices
-class Group(object):
+class Group:
     """Abstract Group.
     """
     __slots__ = ('key', 'name', 'axis')

larray/core/session.py

@@ -18,7 +18,7 @@
 
 
 # XXX: inherit from OrderedDict or Array?
-class Session(object):
+class Session:
     r"""
     Groups several objects together.
 

larray/inout/common.py

@@ -32,7 +32,7 @@ def _get_index_col(nb_axes=None, index_col=None, wide=True):
     return index_col
 
 
-class FileHandler(object):
+class FileHandler:
     r"""
     Abstract class defining the methods for "file handler" subclasses.
 

larray/inout/xw_excel.py

@@ -68,7 +68,7 @@ def _disable_screen_updates(app):
         # unsure we can safely do this
         # xl_app.EnableEvents = False
 
-    class Workbook(object):
+    class Workbook:
         # 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
@@ -366,7 +366,7 @@ 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):
+    class Sheet:
         def __init__(self, workbook, key, xw_sheet=None):
             if xw_sheet is None:
                 xw_sheet = workbook.xw_wkb.sheets[key]
@@ -508,7 +508,7 @@ def __repr__(self):
             xw_sheet = self.xw_sheet
             return f'<{cls.__module__}.{cls.__name__} [{xw_sheet.book.name}]{xw_sheet.name}>'
 
-    class Range(object):
+    class Range:
         def __init__(self, sheet, *args):
             xw_range = sheet.xw_sheet.range(*args)
 
@@ -615,7 +615,7 @@ def open_excel(filepath=None, overwrite_file=False, visible=None, silent=None, a
         return Workbook(filepath, overwrite_file=overwrite_file, visible=visible, silent=silent, app=app,
                         load_addins=load_addins)
 else:
-    class Workbook(object):
+    class Workbook:
         def __init__(self, filepath=None, overwrite_file=False, visible=None, silent=None, app=None, load_addins=None):
             raise Exception("Workbook class cannot be instantiated because xlwings is not installed")
 

larray/inout/xw_reporting.py

@@ -25,7 +25,7 @@ def _validate_template_filename(filename):
     return filename + ext
 
 
-class AbstractReportItem(object):
+class AbstractReportItem:
     def __init__(self, template_dir=None, template=None, graphs_per_row=1):
         self.template_dir = template_dir
         self.template = template
@@ -547,7 +547,7 @@ def to_excel(self, filepath, data_sheet_name='__data__', overwrite=True):
     from xlwings.constants import LegendPosition, HAlign, VAlign, ChartType, RowCol, AxisType, Constants
     from larray.inout.xw_excel import open_excel
 
-    class ItemSize(object):
+    class ItemSize:
         def __init__(self, width, height):
             self.width = width
             self.height = height

larray/tests/test_excel.py

@@ -12,7 +12,7 @@
 
 
 @needs_xlwings
-class TestWorkbook(object):
+class TestWorkbook:
     def test_open_excel(self):
         import pywintypes
 
@@ -118,7 +118,7 @@ def test_rename(self):
 
 
 @needs_xlwings
-class TestSheet(object):
+class TestSheet:
     def test_get_and_set_item(self):
         arr = ndtest((2, 3))
 
@@ -197,7 +197,7 @@ def test_repr(self):
 
 
 @needs_xlwings
-class TestRange(object):
+class TestRange:
     def test_scalar_convert(self):
         with open_excel(visible=False) as wb:
             sheet = wb[0]

larray/util/misc.py

@@ -658,7 +658,7 @@ def wrapper(*args, **kwargs):
     return _deprecate_kwarg
 
 
-class lazy_attribute(object):
+class lazy_attribute:
     """
     Decorate a method of a class and turn it into an attribute on the instance
     when first called. Should obviously only be used when the result of the method is constant.
@@ -727,7 +727,7 @@ def common_type(arrays):
         return object
 
 
-class LHDFStore(object):
+class LHDFStore:
     """Context manager for pandas HDFStore"""
     def __init__(self, filepath_or_buffer, **kwargs):
         if isinstance(filepath_or_buffer, pd.HDFStore):
@@ -747,7 +747,7 @@ def __exit__(self, type_, value, traceback):
             self.store.close()
 
 
-class SequenceZip(object):
+class SequenceZip:
     """
     Represents the "combination" of several sequences.
 
@@ -802,7 +802,7 @@ def __repr__(self):
         return f'SequenceZip({self.sequences})'
 
 
-class Repeater(object):
+class Repeater:
     """
     Returns a virtual sequence with value repeated n times.
     The sequence is never actually created in memory.
@@ -875,7 +875,7 @@ def __repr__(self):
 
 
 # TODO: remove Product from larray_editor.utils (it is almost identical)
-class Product(object):
+class Product:
     """
     Represents the `cartesian product` of several sequences.