From 9090d624b16fb2283b122501a1dc5db26745e2d5 Mon Sep 17 00:00:00 2001
From: un-pogaz <46523284+un-pogaz@users.noreply.github.com>
Date: Sun, 15 Dec 2024 13:17:48 +0100
Subject: [PATCH] Qt Wrapper complitant to pep8

---
 pyproject.toml       |  3 ++-
 src/qt/__init__.py   | 17 +++++++++++++++--
 src/qt/__main__.py   | 10 +++++-----
 src/qt/core.pyi      |  2 +-
 src/qt/dbus.pyi      |  2 +-
 src/qt/loader.py     |  1 -
 src/qt/webengine.pyi |  2 +-
 7 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 168d649cfb..2ab684bce0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,8 @@ select = ['E', 'F', 'I']
 
 [tool.ruff.lint.per-file-ignores]
 "src/calibre/ebooks/unihandecode/unicodepoints.py" = ["E501"]
-"src/qt/__init__.py" = ["E501"]
+"src/qt/*.py" = ['I']
+"src/qt/*.pyi" = ['I']
 
 [tool.ruff.format]
 quote-style = 'single'
diff --git a/src/qt/__init__.py b/src/qt/__init__.py
index be63317158..4366f1400b 100644
--- a/src/qt/__init__.py
+++ b/src/qt/__init__.py
@@ -1,5 +1,19 @@
 # autogenerated by __main__.py do not edit
-top_level_module_names=('QtCore', 'QtGui', 'QtWidgets', 'QtNetwork', 'QtSvg', 'QtPrintSupport', 'QtOpenGL', 'QtOpenGLWidgets', 'QtQuick', 'QtMultimedia', 'QtMultimediaWidgets', 'QtTextToSpeech', 'QtWebEngineCore', 'QtWebEngineWidgets', 'QtDBus')
+top_level_module_names = ('QtCore',
+ 'QtGui',
+ 'QtWidgets',
+ 'QtNetwork',
+ 'QtSvg',
+ 'QtPrintSupport',
+ 'QtOpenGL',
+ 'QtOpenGLWidgets',
+ 'QtQuick',
+ 'QtMultimedia',
+ 'QtMultimediaWidgets',
+ 'QtTextToSpeech',
+ 'QtWebEngineCore',
+ 'QtWebEngineWidgets',
+ 'QtDBus')
 
 
 def __getattr__(name):
@@ -7,4 +21,3 @@ def __getattr__(name):
         import importlib
         return importlib.import_module("PyQt6." + name)
     raise AttributeError(name)
-
diff --git a/src/qt/__main__.py b/src/qt/__main__.py
index a80de5a8c1..379eac9a82 100644
--- a/src/qt/__main__.py
+++ b/src/qt/__main__.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2021, Kovid Goyal <kovid at kovidgoyal.net>
 
 import importlib
@@ -56,10 +55,10 @@ qt_modules = {}
 
 def __getattr__(name):
     return dynamic_load(name, name_map, already_imported, qt_modules, module_names)
-''', file=f)
+''', end='', file=f)
     with open(f'{base}/{name}.pyi', 'w') as f:
         print('# autogenerated by __main__.py do not edit', file=f)
-        f.write('\n'.join(types))
+        print('\n'.join(types), file=f)
     if name == 'core':
         module_names += ('sip',)
         mod = importlib.import_module(f'{QT_WRAPPER}.sip')
@@ -79,7 +78,8 @@ for name in module_lists.keys():
     scan(name)
 with open(f'{base}/__init__.py', 'w') as f:
     print('# autogenerated by __main__.py do not edit', file=f)
-    print(f'{top_level_module_names=}', file=f)
+    print('top_level_module_names = ', end='', file=f)
+    pprint(top_level_module_names, stream=f)
     print(f'''
 
 def __getattr__(name):
@@ -87,4 +87,4 @@ def __getattr__(name):
         import importlib
         return importlib.import_module("{QT_WRAPPER}." + name)
     raise AttributeError(name)
-''', file=f)
+''', end='', file=f)
diff --git a/src/qt/core.pyi b/src/qt/core.pyi
index 8b039701a5..33b0bf6444 100644
--- a/src/qt/core.pyi
+++ b/src/qt/core.pyi
@@ -766,4 +766,4 @@ QGraphicsVideoItem = PyQt6.QtMultimediaWidgets.QGraphicsVideoItem
 QVideoWidget = PyQt6.QtMultimediaWidgets.QVideoWidget
 import PyQt6.QtTextToSpeech
 QTextToSpeech = PyQt6.QtTextToSpeech.QTextToSpeech
-QVoice = PyQt6.QtTextToSpeech.QVoice
\ No newline at end of file
+QVoice = PyQt6.QtTextToSpeech.QVoice
diff --git a/src/qt/dbus.pyi b/src/qt/dbus.pyi
index f289d8c3b4..eafe100a1d 100644
--- a/src/qt/dbus.pyi
+++ b/src/qt/dbus.pyi
@@ -17,4 +17,4 @@ QDBusReply = PyQt6.QtDBus.QDBusReply
 QDBusServiceWatcher = PyQt6.QtDBus.QDBusServiceWatcher
 QDBusSignature = PyQt6.QtDBus.QDBusSignature
 QDBusUnixFileDescriptor = PyQt6.QtDBus.QDBusUnixFileDescriptor
-QDBusVariant = PyQt6.QtDBus.QDBusVariant
\ No newline at end of file
+QDBusVariant = PyQt6.QtDBus.QDBusVariant
diff --git a/src/qt/loader.py b/src/qt/loader.py
index 49a210babe..9ea3d178eb 100644
--- a/src/qt/loader.py
+++ b/src/qt/loader.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2021, Kovid Goyal <kovid at kovidgoyal.net>
 
 import sys
diff --git a/src/qt/webengine.pyi b/src/qt/webengine.pyi
index 1f42fe6a4d..8fe6efb006 100644
--- a/src/qt/webengine.pyi
+++ b/src/qt/webengine.pyi
@@ -41,4 +41,4 @@ qWebEngineGetDomainAndRegistry = PyQt6.QtWebEngineCore.qWebEngineGetDomainAndReg
 qWebEngineProcessName = PyQt6.QtWebEngineCore.qWebEngineProcessName
 qWebEngineVersion = PyQt6.QtWebEngineCore.qWebEngineVersion
 import PyQt6.QtWebEngineWidgets
-QWebEngineView = PyQt6.QtWebEngineWidgets.QWebEngineView
\ No newline at end of file
+QWebEngineView = PyQt6.QtWebEngineWidgets.QWebEngineView