From d00b18264af2da5d64c5fe32f3c3600cf9c8e05d Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 1 Jun 2022 08:58:48 +0200 Subject: 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 --- qutebrowser/misc/earlyinit.py | 8 -------- scripts/dev/run_vulture.py | 1 - 2 files changed, 9 deletions(-) diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index 8be4669bf..39db7b710 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 @@ -267,13 +266,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 -- cgit v1.2.3-54-g00ecf