From adba00e92aa7cb1496c421f8773d57adaa187c3c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 3 Jan 2022 08:42:22 +0530 Subject: [PATCH] pyqt6: Fix some keyboard modifiers checks in the editor --- src/calibre/gui2/tweak_book/editor/smarts/html.py | 4 ++-- src/calibre/gui2/tweak_book/editor/smarts/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/tweak_book/editor/smarts/html.py b/src/calibre/gui2/tweak_book/editor/smarts/html.py index 0be8661bf18a..8ef5ac267c4d 100644 --- a/src/calibre/gui2/tweak_book/editor/smarts/html.py +++ b/src/calibre/gui2/tweak_book/editor/smarts/html.py @@ -732,10 +732,10 @@ def handle_key_press(self, ev, editor): if key in (Qt.Key.Key_BraceLeft, Qt.Key.Key_BraceRight): mods = ev.modifiers() - if int(mods & Qt.KeyboardModifier.ControlModifier): + if mods & Qt.KeyboardModifier.ControlModifier: if self.jump_to_enclosing_tag(editor, key == Qt.Key.Key_BraceLeft): return True - if key == Qt.Key.Key_T and int(ev.modifiers() & (Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.AltModifier)): + if key == Qt.Key.Key_T and ev.modifiers() & (Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.AltModifier): return self.select_tag_contents(editor) return False diff --git a/src/calibre/gui2/tweak_book/editor/smarts/utils.py b/src/calibre/gui2/tweak_book/editor/smarts/utils.py index 4bcc351f98b0..6959cda1c814 100644 --- a/src/calibre/gui2/tweak_book/editor/smarts/utils.py +++ b/src/calibre/gui2/tweak_book/editor/smarts/utils.py @@ -43,7 +43,7 @@ def get_leading_whitespace_on_block(editor, previous=False): def no_modifiers(ev, *args): mods = ev.modifiers() for mod_mask in args: - if int(mods & mod_mask): + if mods & mod_mask: return False return True @@ -51,7 +51,7 @@ def no_modifiers(ev, *args): def test_modifiers(ev, *args): mods = ev.modifiers() for mod_mask in args: - if not int(mods & mod_mask): + if not mods & mod_mask: return False return True