Manually fix remaining ruff check issues

Leaving Python 3 only fixes for now

Author: MHendricks

caveats.py

@@ -11,7 +11,7 @@ def parse(fname):
 
     """
 
-    blocks = list()
+    blocks = []
     with io.open(fname, "r", encoding="utf-8") as f:
         in_block = False
         current_block = None
@@ -31,11 +31,11 @@ def parse(fname):
 
             if line.startswith("```python"):
                 in_block = True
-                current_block = list()
+                current_block = []
                 current_block.append(current_header)
                 blocks.append(current_block)
 
-    tests = list()
+    tests = []
     for block in blocks:
         header = (
             block[0]
@@ -87,7 +87,7 @@ def format_(blocks):
 
     """
 
-    tests = list()
+    tests = []
     function_count = 0  # For each test to have a unique name
 
     for block in blocks:
@@ -99,7 +99,7 @@ def format_(blocks):
             )
 
         # Validate binding on first line
-        if not block["binding"] in ("PySide", "PySide2", "PyQt5", "PyQt4"):
+        if block["binding"] not in ("PySide", "PySide2", "PyQt5", "PyQt4"):
             block["body"].insert(0, ">>> assert False, 'Invalid binding'\n")
 
         if sys.version_info > (3, 4) and block["binding"] in ("PySide"):

examples/QtSiteConfig/main.py

@@ -11,7 +11,7 @@ def test():
     sys.path.insert(0, os.path.dirname(__file__))
 
     try:
-        from Qt import QtCore
+        from Qt import QtCore  # noqa: F401
 
     except ImportError:
         print("Qt.QtCore was successfully removed by QtSiteConfig.py")
@@ -21,9 +21,6 @@ def test():
             "Qt.QtCore was importable, update_members was not applied correctly."
         )
 
-        # Suppress "Qt.QtCore" imported but unused warning
-        QtCore
-
     # Test _misplaced_members is applied correctly
     from Qt import QtGui
 
@@ -35,7 +32,7 @@ def test():
     title = "Test Widget"
     from Qt import QtWidgets, QtCompat
 
-    app = QtWidgets.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)  # noqa: F841
     wid = QtWidgets.QWidget()
     wid.setWindowTitle(title)
 
@@ -57,8 +54,6 @@ def test():
     assert QtCompat.QMainWindow.windowTitleDecorator(win) == check, (
         "Decorated method was added to QtCompat.QMainWindow"
     )
-    # Suppress "app" imported but unused warning
-    app
 
 
 if __name__ == "__main__":

examples/loadUi/baseinstance1.py

@@ -25,7 +25,7 @@ def setup_ui(uifile, base_instance=None):
         return ui
     else:
         for member in dir(ui):
-            if not member.startswith("__") and member is not "staticMetaObject":
+            if not member.startswith("__") and member != "staticMetaObject":
                 setattr(base_instance, member, getattr(ui, member))
         return ui
 

membership.py

@@ -314,7 +314,7 @@ def generate_common_members():
                     print("WARNING: Skipped dir() command", modname, error)
 
         # Remove duplicates and sort
-        MODULES = sorted(list(set(MODULES)))
+        MODULES = sorted(set(MODULES))
 
         if QT_VERBOSE:
             # Print all modules (for debugging)
@@ -336,7 +336,7 @@ def generate_common_members():
         # Sort and remove duplicates
         sorted_members = {}
         for key, value in members.copy().items():
-            sorted_members[key] = sorted(list(set(value)))
+            sorted_members[key] = sorted(set(value))
 
         if QT_VERBOSE:
             # Debug

src/Qt.py

@@ -51,7 +51,9 @@
 __version__ = "2.0.0.dev1"
 
 # Enable support for `from Qt import *`
-__all__ = ["QtCompat"]
+__all__ = [
+    "QtCompat",  # noqa: F822
+]
 
 # Flags from environment variables
 QT_VERBOSE = bool(os.getenv("QT_VERBOSE"))
@@ -628,13 +630,13 @@ def messageOutputHandler(*args):
 
 def _getcpppointer(object):
     if hasattr(Qt, "_shiboken6"):
-        return getattr(Qt, "_shiboken6").getCppPointer(object)[0]
+        return Qt._shiboken6.getCppPointer(object)[0]
     elif hasattr(Qt, "_shiboken2"):
-        return getattr(Qt, "_shiboken2").getCppPointer(object)[0]
+        return Qt._shiboken2.getCppPointer(object)[0]
     elif hasattr(Qt, "_shiboken"):
-        return getattr(Qt, "_shiboken").getCppPointer(object)[0]
+        return Qt._shiboken.getCppPointer(object)[0]
     elif hasattr(Qt, "_sip"):
-        return getattr(Qt, "_sip").unwrapinstance(object)
+        return Qt._sip.unwrapinstance(object)
     raise AttributeError("'module' has no attribute 'getCppPointer'")
 
 
@@ -665,13 +667,13 @@ def _wrapinstance(ptr, base=None):
     )
 
     if Qt.IsPyQt4 or Qt.IsPyQt5 or Qt.IsPyQt6:
-        func = getattr(Qt, "_sip").wrapinstance
+        func = Qt._sip.wrapinstance
     elif Qt.IsPySide2:
-        func = getattr(Qt, "_shiboken2").wrapInstance
+        func = Qt._shiboken2.wrapInstance
     elif Qt.IsPySide6:
-        func = getattr(Qt, "_shiboken6").wrapInstance
+        func = Qt._shiboken6.wrapInstance
     elif Qt.IsPySide:
-        func = getattr(Qt, "_shiboken").wrapInstance
+        func = Qt._shiboken.wrapInstance
     else:
         raise AttributeError("'module' has no attribute 'wrapInstance'")
 
@@ -710,16 +712,16 @@ def _isvalid(object):
 
     """
     if hasattr(Qt, "_shiboken6"):
-        return getattr(Qt, "_shiboken6").isValid(object)
+        return Qt._shiboken6.isValid(object)
 
     elif hasattr(Qt, "_shiboken2"):
-        return getattr(Qt, "_shiboken2").isValid(object)
+        return Qt._shiboken2.isValid(object)
 
     elif hasattr(Qt, "_shiboken"):
-        return getattr(Qt, "_shiboken").isValid(object)
+        return Qt._shiboken.isValid(object)
 
     elif hasattr(Qt, "_sip"):
-        return not getattr(Qt, "_sip").isdeleted(object)
+        return not Qt._sip.isdeleted(object)
 
     else:
         raise AttributeError("'module' has no attribute isValid")
@@ -807,7 +809,7 @@ def _loadUi(uifile, baseinstance=None):
             context = error.__context__
             # Raise the exceptions that are consistent with the other bindings
             if isinstance(context, (IOError, ElementTree.ParseError)):
-                raise context
+                raise context  # noqa: B904
             # Otherwise raise the original PyQt6 specific exception.
             raise
 
@@ -1635,7 +1637,7 @@ def _build_compatibility_members(binding, decorators=None):
 
     """
 
-    decorators = decorators or dict()
+    decorators = decorators or {}
 
     # Allow optional site-level customization of the compatibility members.
     # This method does not need to be implemented in QtSiteConfig.
@@ -1692,7 +1694,7 @@ def _pyside6():
 
     """
 
-    import PySide6 as module
+    import PySide6 as module  # noqa: N813
 
     extras = ["QtSvgWidgets", "QtUiTools"]
     try:
@@ -1758,7 +1760,7 @@ def _pyside2():
 
     """
 
-    import PySide2 as module
+    import PySide2 as module  # noqa: N813
 
     extras = ["QtUiTools"]
     try:
@@ -1810,7 +1812,7 @@ def _pyside2():
 def _pyside():
     """Initialise PySide"""
 
-    import PySide as module
+    import PySide as module  # noqa: N813
 
     extras = ["QtUiTools"]
     try:
@@ -1866,7 +1868,7 @@ def _pyside():
 def _pyqt6():
     """Initialise PyQt6"""
 
-    import PyQt6 as module
+    import PyQt6 as module  # noqa: N813
 
     extras = ["QtSvgWidgets", "uic"]
 
@@ -1906,7 +1908,7 @@ def _pyqt6():
 def _pyqt5():
     """Initialise PyQt5"""
 
-    import PyQt5 as module
+    import PyQt5 as module  # noqa: N813
 
     extras = ["uic"]
 
@@ -1996,7 +1998,7 @@ def _pyqt4():
                     "Warning: API '%s' has already been set to %d.\n" % (api, actual)
                 )
 
-    import PyQt4 as module
+    import PyQt4 as module  # noqa: N813
 
     extras = ["uic"]
     try:
@@ -2259,7 +2261,7 @@ def _install():
     if preferred_order is None:
         # If a json preferred binding was not used use, respect the
         # QT_PREFERRED_BINDING environment variable if defined.
-        preferred_order = list(b for b in QT_PREFERRED_BINDING.split(os.pathsep) if b)
+        preferred_order = [b for b in QT_PREFERRED_BINDING.split(os.pathsep) if b]
 
     order = preferred_order or default_order
 

tests.py

@@ -1177,9 +1177,7 @@ def test_qtcompat_base_class():
     if not QtWidgets.QApplication.instance():
         app = QtWidgets.QApplication(sys.argv)
     else:
-        app = QtWidgets.QApplication.instance()
-    # suppress `local variable 'app' is assigned to but never used`
-    app
+        app = QtWidgets.QApplication.instance()  # noqa: F841
     header = QtWidgets.QHeaderView(get_enum(Qt.QtCore.Qt, "Orientation", "Horizontal"))
 
     # Spot check compatibility functions
@@ -1219,7 +1217,7 @@ def test_membership():
         common_members.pop("QtOpenGL", None)
         common_members.pop("QtMultimedia", None)
 
-    missing = list()
+    missing = []
     for module, members in common_members.items():
         missing.extend(
             member for member in members if not hasattr(getattr(Qt, module), member)
@@ -1237,7 +1235,7 @@ def test_missing():
 
     missing_members = Qt._missing_members.copy()
 
-    missing = list()
+    missing = []
     for module, members in missing_members.items():
         mod = getattr(Qt, module)
         missing.extend(