From 9a9fcb488a97ca50203869a2acf92b9b32f121e2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 19 Dec 2020 13:20:39 +0530 Subject: [PATCH] More stupid PyQt enums --- src/calibre/gui2/viewer/web_view.py | 2 +- src/calibre/gui2/widgets2.py | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py index 6ca987b732..955082cdc0 100644 --- a/src/calibre/gui2/viewer/web_view.py +++ b/src/calibre/gui2/viewer/web_view.py @@ -550,7 +550,7 @@ class WebView(RestartingWebEngineView): def url_changed(self, url): if url.hasFragment(): - frag = url.fragment(url.FullyDecoded) + frag = url.fragment(QUrl.ComponentFormattingOption.FullyDecoded) if frag and frag.startswith('bookpos='): cfi = frag[len('bookpos='):] if cfi: diff --git a/src/calibre/gui2/widgets2.py b/src/calibre/gui2/widgets2.py index df13b9f252..0ef24a221f 100644 --- a/src/calibre/gui2/widgets2.py +++ b/src/calibre/gui2/widgets2.py @@ -4,14 +4,13 @@ import weakref - from PyQt5.Qt import ( QApplication, QByteArray, QCalendarWidget, QCheckBox, QColor, QColorDialog, QComboBox, QDate, QDateTime, QDateTimeEdit, QDialog, QDialogButtonBox, QFont, - QFontInfo, QFontMetrics, QIcon, QKeySequence, QLabel, QLayout, QMenu, - QMimeData, QPalette, QPixmap, QPoint, QPushButton, QRect, QScrollArea, QSize, - QSizePolicy, QStyle, QStyledItemDelegate, Qt, QTabWidget, QTextBrowser, - QToolButton, QUndoCommand, QUndoStack, QWidget, pyqtSignal + QFontInfo, QFontMetrics, QIcon, QKeySequence, QLabel, QLayout, QMenu, QMimeData, + QPalette, QPixmap, QPoint, QPushButton, QRect, QScrollArea, QSize, QSizePolicy, + QStyle, QStyledItemDelegate, Qt, QTabWidget, QTextBrowser, QToolButton, + QUndoCommand, QUndoStack, QUrl, QWidget, pyqtSignal ) from calibre.ebooks.metadata import rating_to_stars @@ -488,7 +487,7 @@ class HTMLDisplay(QTextBrowser): def on_anchor_clicked(self, qurl): if not qurl.scheme() and qurl.hasFragment() and qurl.toString().startswith('#'): - frag = qurl.fragment(qurl.FullyDecoded) + frag = qurl.fragment(QUrl.ComponentFormattingOption.FullyDecoded) if frag: self.scrollToAnchor(frag) return