fixup! pythoneditor: PyQt6 compatibility

Author: ales-erjavec

Orange/widgets/data/utils/pythoneditor/editor.py

@@ -23,7 +23,7 @@
 from Orange.widgets.data.utils.pythoneditor.indenter import Indenter
 from Orange.widgets.data.utils.pythoneditor.lines import Lines
 from Orange.widgets.data.utils.pythoneditor.rectangularselection import RectangularSelection
-from Orange.widgets.data.utils.pythoneditor.vim import Vim, isChar, code, kode
+from Orange.widgets.data.utils.pythoneditor.vim import Vim, isChar, code, key_code
 
 
 # pylint: disable=protected-access
@@ -952,7 +952,7 @@ def typeOverwrite(text):
             # make action shortcuts override keyboard events (non-default Qt behaviour)
             for action in self.actions():
                 seq = action.shortcut()
-                if seq.count() == 1 and kode(seq[0]) == code(event):
+                if seq.count() == 1 and key_code(seq[0]) == code(event):
                     action.trigger()
                     break
             else:

Orange/widgets/data/utils/pythoneditor/tests/base.py

@@ -18,7 +18,7 @@
 
 from Orange.widgets import widget
 from Orange.widgets.data.utils.pythoneditor.editor import PythonEditor
-from Orange.widgets.data.utils.pythoneditor.vim import kode
+from Orange.widgets.data.utils.pythoneditor.vim import key_code
 
 
 def _processPendingEvents(app):
@@ -76,7 +76,7 @@ def keySequenceClicks(widget_, keySequence, extraModifiers=Qt.NoModifier):
     # For now, we don't handle a QKeySequence("Ctrl") or any other modified by itself.
     assert ks.count() > 0
     for _, key in enumerate(ks):
-        key = kode(key)
+        key = key_code(key)
         modifiers = Qt.KeyboardModifiers((key & modifierMask) | enum_as_int(extraModifiers))
         key = key & ~modifierMask
         QTest.keyClick(widget_, Qt.Key(key), modifiers, 10)

Orange/widgets/data/utils/pythoneditor/vim.py

@@ -30,34 +30,36 @@
     setattr(thismodule, '_' + shortName, qtCode)
     setattr(thismodule, '_' + shortName.upper(), enum_as_int(Qt.ShiftModifier) | qtCode)
 
-def kode(comb):
+
+def key_code(comb):
     try:
         return comb.toCombined()
     except AttributeError:
         return enum_as_int(comb)
 
-_0 = kode(Qt.Key_0)
-_Dollar = kode(Qt.ShiftModifier | Qt.Key_Dollar)
-_Percent = kode(Qt.ShiftModifier | Qt.Key_Percent)
-_Caret = kode(Qt.ShiftModifier | Qt.Key_AsciiCircum)
-_Esc = kode(Qt.Key_Escape)
-_Insert = kode(Qt.Key_Insert)
-_Down = kode(Qt.Key_Down)
-_Up = kode(Qt.Key_Up)
-_Left = kode(Qt.Key_Left)
-_Right = kode(Qt.Key_Right)
-_Space = kode(Qt.Key_Space)
-_BackSpace = kode(Qt.Key_Backspace)
-_Equal = kode(Qt.Key_Equal)
-_Less = kode(Qt.ShiftModifier | Qt.Key_Less)
-_Greater = kode(Qt.ShiftModifier | Qt.Key_Greater)
-_Home = kode(Qt.Key_Home)
-_End = kode(Qt.Key_End)
-_PageDown = kode(Qt.Key_PageDown)
-_PageUp = kode(Qt.Key_PageUp)
-_Period = kode(Qt.Key_Period)
-_Enter = kode(Qt.Key_Enter)
-_Return = kode(Qt.Key_Return)
+
+_0 = key_code(Qt.Key_0)
+_Dollar = key_code(Qt.ShiftModifier | Qt.Key_Dollar)
+_Percent = key_code(Qt.ShiftModifier | Qt.Key_Percent)
+_Caret = key_code(Qt.ShiftModifier | Qt.Key_AsciiCircum)
+_Esc = key_code(Qt.Key_Escape)
+_Insert = key_code(Qt.Key_Insert)
+_Down = key_code(Qt.Key_Down)
+_Up = key_code(Qt.Key_Up)
+_Left = key_code(Qt.Key_Left)
+_Right = key_code(Qt.Key_Right)
+_Space = key_code(Qt.Key_Space)
+_BackSpace = key_code(Qt.Key_Backspace)
+_Equal = key_code(Qt.Key_Equal)
+_Less = key_code(Qt.ShiftModifier | Qt.Key_Less)
+_Greater = key_code(Qt.ShiftModifier | Qt.Key_Greater)
+_Home = key_code(Qt.Key_Home)
+_End = key_code(Qt.Key_End)
+_PageDown = key_code(Qt.Key_PageDown)
+_PageUp = key_code(Qt.Key_PageUp)
+_Period = key_code(Qt.Key_Period)
+_Enter = key_code(Qt.Key_Enter)
+_Return = key_code(Qt.Key_Return)
 
 
 def code(ev):