1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
|
From: YOKOTA Hiroshi <yokota.hgml@gmail.com>
Date: Fri, 5 Apr 2024 13:44:41 +0900
Subject: Revert "sort imports in all python files"
Forwarded: not-needed
This reverts commit 53b74283a40469b0beecec56eea199d7b9f73198.
---
src/calibre/ebooks/pdf/html_writer.py | 22 ++++++++++++----------
src/calibre/utils/podofo/__init__.py | 1 -
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/calibre/ebooks/pdf/html_writer.py b/src/calibre/ebooks/pdf/html_writer.py
index 1f3cf11..b95b1fc 100644
--- a/src/calibre/ebooks/pdf/html_writer.py
+++ b/src/calibre/ebooks/pdf/html_writer.py
@@ -9,21 +9,20 @@ import signal
import sys
from collections import namedtuple
from functools import lru_cache
-from itertools import count, repeat
-
from html5_parser import parse
-from qt.core import QApplication, QByteArray, QMarginsF, QObject, QPageLayout, Qt, QTimer, QUrl, pyqtSignal, sip
+from itertools import count, repeat
+from qt.core import (
+ QApplication, QByteArray, QMarginsF, QObject, QPageLayout, Qt, QTimer, QUrl,
+ pyqtSignal, sip,
+)
from qt.webengine import (
- QWebEnginePage,
- QWebEngineProfile,
- QWebEngineSettings,
- QWebEngineUrlRequestInterceptor,
- QWebEngineUrlRequestJob,
+ QWebEnginePage, QWebEngineProfile, QWebEngineSettings,
+ QWebEngineUrlRequestInterceptor, QWebEngineUrlRequestJob,
QWebEngineUrlSchemeHandler,
)
from calibre import detect_ncpus, human_readable, prepare_string_for_xml
-from calibre.constants import FAKE_HOST, FAKE_PROTOCOL, __appname__, __version__, ismacos, iswindows
+from calibre.constants import FAKE_HOST, FAKE_PROTOCOL, __version__, ismacos, iswindows, __appname__
from calibre.ebooks.metadata.xmp import metadata_to_xmp_packet
from calibre.ebooks.oeb.base import XHTML, XPath
from calibre.ebooks.oeb.polish.container import Container as ContainerBase
@@ -38,7 +37,10 @@ from calibre.utils.fonts.sfnt.merge import merge_truetype_fonts_for_pdf
from calibre.utils.fonts.sfnt.subset import pdf_subset
from calibre.utils.logging import default_log
from calibre.utils.monotonic import monotonic
-from calibre.utils.podofo import add_image_page, dedup_type3_fonts, get_podofo, remove_unused_fonts, set_metadata_implementation
+from calibre.utils.podofo import (
+ add_image_page, dedup_type3_fonts, get_podofo, remove_unused_fonts,
+ set_metadata_implementation,
+)
from calibre.utils.resources import get_path as P
from calibre.utils.short_uuid import uuid4
from calibre.utils.webengine import secure_webengine, send_reply, setup_profile
diff --git a/src/calibre/utils/podofo/__init__.py b/src/calibre/utils/podofo/__init__.py
index 68c8418..cd29451 100644
--- a/src/calibre/utils/podofo/__init__.py
+++ b/src/calibre/utils/podofo/__init__.py
@@ -213,7 +213,6 @@ def test_roundtrip(src, dest):
def test_podofo():
import tempfile
-
from calibre.ebooks.metadata.book.base import Metadata
from calibre.ebooks.metadata.xmp import metadata_to_xmp_packet
# {{{
|