summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-06-01 08:58:48 +0200
committerFlorian Bruhin <me@the-compiler.org>2022-08-23 18:31:42 +0200
commit0dbad34b3955a3b7376daa71273bbb07dacb3080 (patch)
treef889989f9719887cd005477f9010328c9c974ddd
parent9e99400d8f3fd1251beedd1c7f089a2278c55182 (diff)
downloadqutebrowser-0dbad34b3955a3b7376daa71273bbb07dacb3080.tar.gz
qutebrowser-0dbad34b3955a3b7376daa71273bbb07dacb3080.zip
Revert "Patch PyQt6 QUrl flag behavior for Python 3.11"
This reverts commit 14c1593de2abd9f24a223805a4740d8d9fd93622. Fixed in Python 3.11b2: https://github.com/python/cpython/pull/93302
-rw-r--r--qutebrowser/misc/earlyinit.py8
-rwxr-xr-xscripts/dev/run_vulture.py1
2 files changed, 0 insertions, 9 deletions
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index e7ef1472e..7165d5bdf 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -30,7 +30,6 @@ except ImportError:
hunter = None
import sys
-import enum
import faulthandler
import traceback
import signal
@@ -271,13 +270,6 @@ def configure_pyqt():
# FIXME:qt6 solve this in qutebrowser/qt/sip.py equivalent?
pass
- # WORKAROUND for
- # https://www.riverbankcomputing.com/pipermail/pyqt/2022-May/044668.html
- if hasattr(enum, "FlagBoundary"): # Python 3.11
- from qutebrowser.qt.core import QUrl
- # pylint: disable-next=protected-access
- QUrl.UrlFormattingOption._boundary_ = enum.FlagBoundary.KEEP
-
def init_log(args):
"""Initialize logging.
diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py
index 2e9f5e745..901abe235 100755
--- a/scripts/dev/run_vulture.py
+++ b/scripts/dev/run_vulture.py
@@ -91,7 +91,6 @@ def whitelist_generator(): # noqa: C901
yield 'PaintContext.clip' # from completiondelegate.py
yield 'logging.LogRecord.log_color' # from logging.py
yield 'scripts.utils.use_color' # from asciidoc2html.py
- yield 'QUrl.UrlFormattingOption._boundary_'
for attr in ['pyeval_output', 'log_clipboard', 'fake_clipboard']:
yield 'qutebrowser.misc.utilcmds.' + attr