From 3c5c0bcfeb4d38e8c932e137ad79fd0fa3db6c4e Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 18 Jun 2022 14:59:53 +0200 Subject: Revert "wip: Work around PyQt snapshot enum weirdness" This reverts commit 400dbc8de3139d2a7015bcf58f14e56c46f3bdb9. --- qutebrowser/keyinput/keyutils.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qutebrowser/keyinput/keyutils.py b/qutebrowser/keyinput/keyutils.py index e79e1105d..ce9c10dbc 100644 --- a/qutebrowser/keyinput/keyutils.py +++ b/qutebrowser/keyinput/keyutils.py @@ -204,7 +204,7 @@ def _is_surrogate(key: Qt.Key) -> bool: (Base Multilingual Plane). """ _assert_plain_key(key) - return 0xd800 <= qtutils.extract_enum_val(key) <= 0xdfff + return 0xd800 <= key <= 0xdfff def _remap_unicode(key: Qt.Key, text: str) -> Qt.Key: @@ -252,12 +252,11 @@ def _key_to_string(key: Qt.Key) -> str: A name of the key as a string. """ _assert_plain_key(key) - val = qtutils.extract_enum_val(key) - if val in _SPECIAL_NAMES: - return _SPECIAL_NAMES[val] + if key in _SPECIAL_NAMES: + return _SPECIAL_NAMES[key] - result = QKeySequence(val).toString() + result = QKeySequence(key).toString() _check_valid_utf8(result, key) return result -- cgit v1.2.3-54-g00ecf