Remove unnecessary use of 'object' in class construction

Considering we are not compatible with Python 2 anymore,
we can drop the 'object' explicit inheritance in the class
declaration.

Pick-to: 6.8
Change-Id: Iac3a95aa9721c3ff1a755f457c0936ca157a8470
Reviewed-by: Shyamnath Premnadh <[email protected]>
Reviewed-by: Friedemann Kleint <[email protected]>

Author: cmaureir

build_scripts/build_info_collector.py

@@ -130,7 +130,7 @@ def get_py_library(build_type, py_version, py_prefix, py_libdir, py_include_dir)
     return py_library
 
 
-class BuildInfoCollectorMixin(object):
+class BuildInfoCollectorMixin:
     build_base: str
     build_lib: str
     cmake: str

build_scripts/config.py

@@ -17,7 +17,7 @@
     import tomli as tomllib
 
 
-class Config(object, metaclass=Singleton):
+class Config(metaclass=Singleton):
     def __init__(self):
         # Constants
         self._build_type_all = "all"

build_scripts/options.py

@@ -41,7 +41,7 @@ def _warn_deprecated_option(option, replacement=None):
     log.warning(w)
 
 
-class Options(object, metaclass=Singleton):
+class Options(metaclass=Singleton):
     def __init__(self):
 
         # Dictionary containing values of all the possible options.
@@ -181,7 +181,7 @@ def resolve(self):
         }
 
 
-class CommandMixin(object):
+class CommandMixin:
     """Mixin for the setuptools build/install commands handling the options."""
 
     _static_class_finalized_once = False

build_scripts/qtinfo.py

@@ -10,7 +10,7 @@
                     platform_cmake_options)
 
 
-class QtInfo(object):
+class QtInfo:
     _instance = None  # singleton helpers
 
     def __new__(cls):  # __new__ always a classmethod

build_scripts/setup_runner.py

@@ -19,7 +19,7 @@
 from build_scripts.log import log, LogLevel
 
 
-class SetupRunner(object):
+class SetupRunner:
     def __init__(self, orig_argv):
         self.invocations_list = []
 

examples/widgets/itemviews/stardelegate/starrating.py

@@ -12,7 +12,7 @@
 PAINTING_SCALE_FACTOR = 20
 
 
-class StarRating(object):
+class StarRating:
     """ Handle the actual painting of the stars themselves. """
 
     def __init__(self, starCount=1, maxStarCount=5):

examples/widgets/tutorials/addressbook/part2.py

@@ -13,7 +13,7 @@
 
 
 class SortedDict(dict):
-    class Iterator(object):
+    class Iterator:
         def __init__(self, sorted_dict):
             self._dict = sorted_dict
             self._keys = sorted(self._dict.keys())

examples/widgets/tutorials/addressbook/part3.py

@@ -13,7 +13,7 @@
 
 
 class SortedDict(dict):
-    class Iterator(object):
+    class Iterator:
         def __init__(self, sorted_dict):
             self._dict = sorted_dict
             self._keys = sorted(self._dict.keys())

examples/widgets/tutorials/addressbook/part4.py

@@ -13,7 +13,7 @@
 
 
 class SortedDict(dict):
-    class Iterator(object):
+    class Iterator:
         def __init__(self, sorted_dict):
             self._dict = sorted_dict
             self._keys = sorted(self._dict.keys())

examples/widgets/tutorials/addressbook/part5.py

@@ -13,7 +13,7 @@
 
 
 class SortedDict(dict):
-    class Iterator(object):
+    class Iterator:
         def __init__(self, sorted_dict):
             self._dict = sorted_dict
             self._keys = sorted(self._dict.keys())

examples/widgets/tutorials/addressbook/part6.py

@@ -14,7 +14,7 @@
 
 
 class SortedDict(dict):
-    class Iterator(object):
+    class Iterator:
         def __init__(self, sorted_dict):
             self._dict = sorted_dict
             self._keys = sorted(self._dict.keys())

examples/widgets/tutorials/addressbook/part7.py

@@ -14,7 +14,7 @@
 
 
 class SortedDict(dict):
-    class Iterator(object):
+    class Iterator:
         def __init__(self, sorted_dict):
             self._dict = sorted_dict
             self._keys = sorted(self._dict.keys())

examples/widgets/widgets/tetrix/tetrix.py

@@ -368,7 +368,7 @@ def draw_square(self, painter, x, y, shape):
                          y + self.square_height() - 1, x + self.square_width() - 1, y + 1)
 
 
-class TetrixPiece(object):
+class TetrixPiece:
     coords_table = (
         ((0, 0), (0, 0), (0, 0), (0, 0)),
         ((0, -1), (0, 0), (-1, 0), (-1, 1)),

sources/pyside6/doc/inheritance_graph.py

@@ -32,7 +32,7 @@ def format_dict(d):
     return result
 
 
-class InheritanceGraph(object):
+class InheritanceGraph:
     """
     Given a list of classes, determines the set of classes that they inherit
     from all the way to the root "object", and then is able to generate a

sources/pyside6/tests/QtCore/bug_835.py

@@ -18,7 +18,7 @@
 set_counter = 0
 
 
-class Descriptor(object):
+class Descriptor:
     def __get__(self, obj, owner):
         global get_counter
 

sources/pyside6/tests/QtCore/classinfo_test.py

@@ -93,7 +93,7 @@ def test_function():
             pass
         self.assertRaises(TypeError, make_info(), test_function)
 
-        class NotAQObject(object):
+        class NotAQObject:
             pass
         self.assertRaises(TypeError, make_info(), NotAQObject)
 

sources/pyside6/tests/QtCore/mockclass_test.py

@@ -18,7 +18,7 @@
 from PySide6.QtCore import QCoreApplication
 
 
-class Mock(object):
+class Mock:
     def __init__(self):
         self.called = False
         self.return_value = None

sources/pyside6/tests/QtCore/qbytearray_operator_iadd_test.py

@@ -15,7 +15,7 @@
 from helper.docmodifier import DocModifier
 
 
-class BaseQByteArrayOperatorIAdd(object):
+class BaseQByteArrayOperatorIAdd:
     '''Base class for QByteArray += operator tests.
 
     Implementing classes should inherit from unittest.TestCase and implement

sources/pyside6/tests/QtCore/qobject_inherits_test.py

@@ -44,7 +44,7 @@ def testPythonMultiInheritance(self):
         # QObject.inherits(classname) should fail if classname isn't a
         # QObject subclass
 
-        class Parent(object):
+        class Parent:
             # Dummy parent
             pass
 
@@ -71,6 +71,8 @@ def __init__(self):
 
     def testMultipleInheritance(self):
         def declareClass():
+            # Note: 'object' cannot removed from this class declaration
+            # in order to make it work with QObject.
             class Foo(object, QObject):
                 pass
 

sources/pyside6/tests/QtQml/bug_825_old.py

@@ -30,7 +30,7 @@ class MetaA(type):
     pass
 
 
-class A(object):
+class A:
     __metaclass__ = MetaA
 
 

sources/pyside6/tests/QtUiTools/bug_426.py

@@ -16,7 +16,7 @@
 from PySide6.QtUiTools import QUiLoader
 
 
-class Window(object):
+class Window:
     def __init__(self):
         loader = QUiLoader()
         filePath = os.path.join(os.path.dirname(__file__), 'bug_426.ui')

sources/pyside6/tests/QtWidgets/bug_836.py

@@ -15,15 +15,15 @@
 from PySide6.QtWidgets import QApplication, QFrame
 
 
-class Mixin1(object):
+class Mixin1:
     pass
 
 
-class Mixin2(object):
+class Mixin2:
     pass
 
 
-class Mixin3(object):
+class Mixin3:
     pass
 
 

sources/pyside6/tests/QtWidgets/bug_921.py

@@ -24,7 +24,7 @@ class Signaller(QObject):
     s3 = Signal()
 
 
-class Window(object):
+class Window:
 
     def __init__(self, s):
         self._window = QMainWindow()

sources/pyside6/tests/QtWidgets/import_test.py

@@ -1,2 +1,2 @@
-class PysideImportTest2(object):
+class PysideImportTest2:
     pass

sources/pyside6/tests/QtWidgets/qvariant_test.py

@@ -28,7 +28,7 @@ def itemChange(self, change, value):
         return value
 
 
-class Sequence(object):
+class Sequence:
     # Having the __getitem__ method on a class transform the Python
     # type to a PySequence.
     # Before the patch: aa75437f9119d997dd290471ac3e2cc88ca88bf1

sources/pyside6/tests/pysidetest/mixin_signal_slots_test.py

@@ -20,7 +20,7 @@
 from PySide6.QtCore import QObject, Signal, Slot
 
 
-class Mixin(object):
+class Mixin:
     mixinSignal = Signal()
 
     def __init__(self, *args, **kwargs):
@@ -39,7 +39,7 @@ def mixinTwoSlot(self):
         self.mixinTwoSlotCalled = True
 
 
-class MixinThree(object):
+class MixinThree:
     mixinThreeSignal = Signal()
 
     def __init__(self, *args, **kwargs):

sources/pyside6/tests/pysidetest/multiple_inheritance_test.py

@@ -22,7 +22,7 @@ def xprint(*args, **kw):
 
 
 # This is the original testcase of PYSIDE-1564
-class Age(object):
+class Age:
     def __init__(self, age=0, **kwds):
         super().__init__(**kwds)
 
@@ -117,7 +117,7 @@ class II(G, H, QtWidgets.QLabel):
 
 # PYSIDE-2294: Friedemann's test adapted.
 #              We need to ignore positional args in mixin classes.
-class Ui_X_MainWindow(object):  # Emulating uic
+class Ui_X_MainWindow:  # Emulating uic
     def setupUi(self, MainWindow):
         MainWindow.resize(400, 300)
         self.lbl = QLabel(self)
@@ -160,7 +160,7 @@ def testParentDoesNotCrash(self):
 
 # PYSIDE-2654: Additional missing init test.
 #              This must work if no __init__ is defined (Ui_Form)
-class Ui_Form(object):
+class Ui_Form:
     pass
 
 

sources/pyside6/tests/pysidetest/property_python_test.py

@@ -89,7 +89,7 @@ def spam(self):
         raise PropertyDel(self._spam)
 
 
-class PropertyDocBase(object):
+class PropertyDocBase:
     _spam = 1
 
     def _get_spam(self):
@@ -188,7 +188,7 @@ def test_property_builtin_doc_writable(self):
     @unittest.skipIf(sys.flags.optimize >= 2,
                      "Docstrings are omitted with -O2 and above")
     def test_property_decorator_doc_writable(self):
-        class PropertyWritableDoc(object):
+        class PropertyWritableDoc:
 
             @Property(object)
             def spam(self):

sources/pyside6/tests/registry/init_platform.py

@@ -104,7 +104,7 @@ def set_ospaths(build_dir):
 sourcepath = os.path.splitext(__file__)[0] + ".py"
 
 
-class Formatter(object):
+class Formatter:
     """
     Formatter is formatting the signature listing of an enumerator.
 

sources/pyside6/tests/util/helper/basicpyslotcase.py

@@ -5,7 +5,7 @@
 import gc
 
 
-class BasicPySlotCase(object):
+class BasicPySlotCase:
     '''Base class that tests python slots and signal emissions.
 
     Python slots are defined as any callable passed to QObject.connect().

sources/pyside6/tests/util/helper/docmodifier.py

@@ -59,7 +59,7 @@ def __init__(mcs, name, bases, dct):
 if __name__ == '__main__':
 
     # tests
-    class BaseTest(object):
+    class BaseTest:
         __metaclass__ = DocModifier
 
         def testBase(self):

sources/pyside6/tests/util/processtimer.py

@@ -15,7 +15,7 @@ def __str__(self):
         return repr(self.msg)
 
 
-class ProcessTimer(object):
+class ProcessTimer:
     '''Timeout function for controlling a subprocess.Popen instance.
 
     Naive implementation using busy loop, see later other means

sources/shiboken6/libshiboken/embed/signature_bootstrap.py

@@ -167,7 +167,7 @@ def prepare_zipfile():
     return sys.meta_path, EmbeddableZipImporter(vzip)
 
 
-class EmbeddableZipImporter(object):
+class EmbeddableZipImporter:
 
     def __init__(self, zip_file):
         def p2m(filename):

sources/shiboken6/shibokenmodule/Shiboken.pyi

@@ -13,12 +13,12 @@ Shiboken, except for defaults which are replaced by "...".
 from shiboken6 import Shiboken
 
 
-class Object(object):
+class Object:
 
     def __init__(self) -> None: ...
 
 
-class VoidPtr(object):
+class VoidPtr:
     def __init__(self, value: int) -> None: ...
 
 

sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py

@@ -44,7 +44,7 @@ def signal_check(thing):
     return thing and type(thing) in (Signal, SignalInstance)
 
 
-class ExactEnumerator(object):
+class ExactEnumerator:
     """
     ExactEnumerator enumerates all signatures in a module as they are.
 

sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py

@@ -30,7 +30,7 @@
 indent = " " * 4
 
 
-class Writer(object):
+class Writer:
     def __init__(self, outfile, *args):
         self.outfile = outfile
         self.history = [True, True]