Merge pull request #1149 from DimitriPapadopoulos/object

MNT: No need to inherit `object` in Python 3

Author: effigies

doc/source/devel/biaps/biap_0002.rst

@@ -104,8 +104,8 @@ sliced array, as in:
 
 .. code:: python
 
-    class SomeImage(object):
-        class Slicer(object):
+    class SomeImage:
+        class Slicer:
             def __init__(self, parent):
                 self.parent = parent
             def __getitem__(self, slicedef):

doc/tools/apigen.py

@@ -28,7 +28,7 @@
 DEBUG = True
 
 
-class ApiDocWriter(object):
+class ApiDocWriter:
     """ Class for automatic detection and parsing of API docs
     to Sphinx-parsable reST format"""
 
@@ -118,7 +118,7 @@ def _get_object_name(self, line):
         >>> docwriter = ApiDocWriter('sphinx')
         >>> docwriter._get_object_name("  def func():  ")
         'func'
-        >>> docwriter._get_object_name("  class Klass(object):  ")
+        >>> docwriter._get_object_name("  class Klass:  ")
         'Klass'
         >>> docwriter._get_object_name("  class Klass:  ")
         'Klass'

nibabel/arraywriters.py

@@ -45,7 +45,7 @@ class ScalingError(WriterError):
     pass
 
 
-class ArrayWriter(object):
+class ArrayWriter:
 
     def __init__(self, array, out_dtype=None, **kwargs):
         r""" Initialize array writer

nibabel/batteryrunners.py

@@ -108,7 +108,7 @@ def chk_pixdims(hdr, fix=True):
 """
 
 
-class BatteryRunner(object):
+class BatteryRunner:
     """ Class to run set of checks """
 
     def __init__(self, checks):
@@ -174,7 +174,7 @@ def __len__(self):
         return len(self._checks)
 
 
-class Report(object):
+class Report:
 
     def __init__(self,
                  error=Exception,

nibabel/cmdline/dicomfs.py

@@ -18,7 +18,7 @@
 import logging
 
 
-class dummy_fuse(object):
+class dummy_fuse:
     """Dummy fuse "module" so that nose does not blow during doctests"""
     Fuse = object
 

nibabel/data.py

@@ -31,7 +31,7 @@ class BomberError(DataError, AttributeError):
     pass
 
 
-class Datasource(object):
+class Datasource:
     """ Simple class to add base path to relative path """
 
     def __init__(self, base_path):
@@ -302,7 +302,7 @@ def make_datasource(pkg_def, **kwargs):
     return VersionedDatasource(pth)
 
 
-class Bomber(object):
+class Bomber:
     """ Class to raise an informative error when used """
 
     def __init__(self, name, msg):

nibabel/deprecated.py

@@ -7,7 +7,7 @@
 from .pkg_info import cmp_pkg_version
 
 
-class ModuleProxy(object):
+class ModuleProxy:
     """ Proxy for module that may not yet have been imported
 
     Parameters
@@ -39,12 +39,12 @@ def __repr__(self):
         return f"<module proxy for {self._module_name}>"
 
 
-class FutureWarningMixin(object):
+class FutureWarningMixin:
     """ Insert FutureWarning for object creation
 
     Examples
     --------
-    >>> class C(object): pass
+    >>> class C: pass
     >>> class D(FutureWarningMixin, C):
     ...     warn_message = "Please, don't use this class"
 

nibabel/deprecator.py

@@ -83,7 +83,7 @@ def _add_dep_doc(old_doc, dep_doc, setup='', cleanup=''):
                      old_lines[next_line:] + cleanup_lines + [''])
 
 
-class Deprecator(object):
+class Deprecator:
     """ Class to make decorator marking function or method as deprecated
 
     The decorated function / method will:

nibabel/dft.py

@@ -58,7 +58,7 @@ def __str__(self):
         return fmt % (self.i + 1, self.si.instance_number)
 
 
-class _Study(object):
+class _Study:
 
     def __init__(self, d):
         self.uid = d['uid']
@@ -91,7 +91,7 @@ def patient_name_or_uid(self):
         return self.patient_name
 
 
-class _Series(object):
+class _Series:
 
     def __init__(self, d):
         self.uid = d['uid']
@@ -219,7 +219,7 @@ def nifti_size(self):
         return 352 + 2 * len(self.storage_instances) * self.columns * self.rows
 
 
-class _StorageInstance(object):
+class _StorageInstance:
 
     def __init__(self, d):
         self.uid = d['uid']

nibabel/ecat.py

@@ -511,7 +511,7 @@ def read_subheaders(fileobj, mlist, endianness):
     return subheaders
 
 
-class EcatSubHeader(object):
+class EcatSubHeader:
 
     _subhdrdtype = subhdr_dtype
     _data_type_codes = data_type_codes
@@ -660,7 +660,7 @@ def data_from_fileobj(self, frame=0, orientation=None):
         return data
 
 
-class EcatImageArrayProxy(object):
+class EcatImageArrayProxy:
     """ Ecat implementation of array proxy protocol
 
     The array proxy allows us to freeze the passed fileobj and