to math.asin|angle
qtbot.keyClicks(code_editor, 'math.aangle')
for i in range(len('angle')):
- qtbot.keyClick(code_editor, Qt.Key_Left)
+ qtbot.keyClick(code_editor, Qt.Key.Key_Left)
with qtbot.waitSignal(
code_editor.completions_response_signal, timeout=30000):
@@ -641,14 +641,14 @@ def test_completions(completions_codeeditor, qtbot):
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
qtbot.keyPress(code_editor, 's')
assert "asin(x)" in [x['label'] for x in sig.args[0]]
- qtbot.keyPress(completion, Qt.Key_Enter, delay=300)
+ qtbot.keyPress(completion, Qt.Key.Key_Enter, delay=300)
for i in range(len('angle')):
- qtbot.keyClick(code_editor, Qt.Key_Right)
+ qtbot.keyClick(code_editor, Qt.Key.Key_Right)
- qtbot.keyPress(code_editor, Qt.Key_Enter, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter, delay=300)
assert code_editor.toPlainText() == 'import math\nmath.hypot\n'\
'math.hypot()\nmath.asin\n'\
'math.f\nmath.asin\n'\
@@ -663,9 +663,9 @@ def test_completions(completions_codeeditor, qtbot):
try:
with qtbot.waitSignal(completion.sig_show_completions,
timeout=5000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
- qtbot.keyPress(code_editor, Qt.Key_Backspace)
- qtbot.keyPress(code_editor, Qt.Key_Escape)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Backspace)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Escape)
raise RuntimeError("The signal should not have been received!")
except pytestqt.exceptions.TimeoutError:
pass
@@ -673,8 +673,8 @@ def test_completions(completions_codeeditor, qtbot):
try:
with qtbot.waitSignal(completion.sig_show_completions,
timeout=5000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
- qtbot.keyPress(code_editor, Qt.Key_Return)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Return)
raise RuntimeError("The signal should not have been received!")
except pytestqt.exceptions.TimeoutError:
pass
@@ -716,15 +716,15 @@ def test_func(xlonger, y1, some_z):
code_editor.completions_response_signal, timeout=30000):
code_editor.document_did_change()
- qtbot.keyPress(code_editor, Qt.Key_Enter, delay=300)
- qtbot.keyPress(code_editor, Qt.Key_Enter, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter, delay=300)
qtbot.keyClicks(code_editor, 'test_')
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
if len(sig.args[0]) > 1:
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
assert 'test_func(xlonger, y1, some_z)' in {
x['label'] for x in sig.args[0]}
@@ -742,31 +742,31 @@ def test_func(xlonger, y1, some_z):
assert 'xlonger' == arg1
assert snippets.active_snippet == 1
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
cursor = code_editor.textCursor()
arg2 = cursor.selectedText()
assert 'y1' == arg2
assert snippets.active_snippet == 2
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
cursor = code_editor.textCursor()
arg2 = cursor.selectedText()
assert 'some_z' == arg2
assert snippets.active_snippet == 3
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
assert not snippets.is_snippet_active
- qtbot.keyPress(code_editor, Qt.Key_Enter, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter, delay=300)
qtbot.keyClicks(code_editor, 'test_')
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
if len(sig.args[0]) > 1:
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
# Replace selection
qtbot.keyClicks(code_editor, 'arg1')
@@ -774,7 +774,7 @@ def test_func(xlonger, y1, some_z):
# Snippets are disabled when there are no more left
for _ in range(0, 3):
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
assert not snippets.is_snippet_active
cursor = code_editor.textCursor()
@@ -783,25 +783,25 @@ def test_func(xlonger, y1, some_z):
text1 = cursor.selectedText()
assert text1 == 'test_func(arg1, y1, some_z)'
- qtbot.keyPress(code_editor, Qt.Key_Enter, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter, delay=300)
qtbot.keyClicks(code_editor, 'test_')
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
if len(sig.args[0]) > 1:
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
assert snippets.active_snippet == 2
# Extend text from right
- qtbot.keyPress(code_editor, Qt.Key_Right, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Right, delay=300)
qtbot.keyClicks(code_editor, '_var')
- qtbot.keyPress(code_editor, Qt.Key_Up, delay=300)
- qtbot.keyPress(code_editor, Qt.Key_Down, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Up, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Down, delay=300)
cursor = code_editor.textCursor()
cursor.movePosition(QTextCursor.StartOfBlock)
@@ -812,25 +812,25 @@ def test_func(xlonger, y1, some_z):
cursor.movePosition(QTextCursor.EndOfBlock)
code_editor.setTextCursor(cursor)
- qtbot.keyPress(code_editor, Qt.Key_Enter, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter, delay=300)
qtbot.keyClicks(code_editor, 'test_')
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
if len(sig.args[0]) > 1:
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
for _ in range(0, 2):
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
assert snippets.active_snippet == 3
# Extend text from left
- qtbot.keyPress(code_editor, Qt.Key_Left, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Left, delay=300)
qtbot.keyClicks(code_editor, 's')
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
assert not snippets.is_snippet_active
@@ -840,24 +840,24 @@ def test_func(xlonger, y1, some_z):
text1 = cursor.selectedText()
assert text1 == 'test_func(xlonger, y1, ssome_z)'
- qtbot.keyPress(code_editor, Qt.Key_Enter, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter, delay=300)
qtbot.keyClicks(code_editor, 'test_')
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
if len(sig.args[0]) > 1:
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
assert snippets.active_snippet == 1
# Delete snippet region
- qtbot.keyPress(code_editor, Qt.Key_Left, delay=300)
- qtbot.keyPress(code_editor, Qt.Key_Backspace, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Left, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Backspace, delay=300)
assert len(snippets.snippets_map) == 3
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
cursor = code_editor.textCursor()
arg1 = cursor.selectedText()
assert 'some_z' == arg1
@@ -869,7 +869,7 @@ def test_func(xlonger, y1, some_z):
assert len(snippets.snippets_map) == 4
for _ in range(0, 2):
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
cursor = code_editor.textCursor()
arg1 = cursor.selectedText()
@@ -881,27 +881,27 @@ def test_func(xlonger, y1, some_z):
assert len(snippets.snippets_map) == 3
for _ in range(0, 3):
- qtbot.keyPress(code_editor, Qt.Key_Tab)
- qtbot.keyPress(code_editor, Qt.Key_Right)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Right)
- qtbot.keyPress(code_editor, Qt.Key_Enter)
- qtbot.keyPress(code_editor, Qt.Key_Backspace)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Backspace)
qtbot.keyClicks(code_editor, 'test_')
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
if len(sig.args[0]) > 1:
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
# Delete text
- qtbot.keyPress(code_editor, Qt.Key_Left, delay=300)
- qtbot.keyPress(code_editor, Qt.Key_Right, delay=300)
- qtbot.keyPress(code_editor, Qt.Key_Backspace)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Left, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Right, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Backspace)
for _ in range(0, 3):
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
cursor = code_editor.textCursor()
cursor.movePosition(QTextCursor.StartOfBlock)
@@ -940,12 +940,12 @@ def test_kite_code_snippets(kite_codeeditor, qtbot):
# Set cursor to start
code_editor.go_to_line(1)
qtbot.keyClicks(code_editor, 'import numpy as np')
- qtbot.keyPress(code_editor, Qt.Key_Return)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Return)
qtbot.keyClicks(code_editor, 'np.sin')
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
assert 'sin('+u'\u2026'+')' in {
x['label'] for x in sig.args[0]}
@@ -956,7 +956,7 @@ def test_kite_code_snippets(kite_codeeditor, qtbot):
# Insert completion
qtbot.wait(500)
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
assert snippets.is_snippet_active
# Get code selected text
@@ -966,7 +966,7 @@ def test_kite_code_snippets(kite_codeeditor, qtbot):
assert snippets.active_snippet == 1
code_editor.set_cursor_position('eol')
- qtbot.keyPress(code_editor, Qt.Key_Left)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Left)
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig2:
@@ -977,11 +977,11 @@ def test_kite_code_snippets(kite_codeeditor, qtbot):
expected_insert = '${1:[x]})$0'
insert = sig2.args[0][0]
assert expected_insert == insert['textEdit']['newText']
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
# Snippets are disabled when there are no more left
code_editor.set_cursor_position('eol')
- qtbot.keyPress(code_editor, Qt.Key_Enter)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter)
assert not snippets.is_snippet_active
cursor = code_editor.textCursor()
@@ -1017,25 +1017,25 @@ def test_completion_order(completions_codeeditor, qtbot):
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
first_completion = sig.args[0][0]
assert first_completion['insertText'] == 'import'
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
- qtbot.keyPress(code_editor, Qt.Key_Enter, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter, delay=300)
qtbot.keyClicks(code_editor, 'Impo')
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
first_completion = sig.args[0][0]
assert first_completion['insertText'] == 'ImportError'
@@ -1057,7 +1057,7 @@ def test_text_snippet_completions(completions_codeeditor, qtbot):
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
qtbot.keyClicks(code_editor, 'f')
- qtbot.keyPress(code_editor, Qt.Key_Tab, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab, delay=300)
results = [x for x in sig.args[0] if x['provider'] == 'Snippets']
@@ -1088,10 +1088,10 @@ def spam():
completion_plugin.after_configuration_update([])
qtbot.wait(500)
qtbot.keyClicks(code_editor, 'import foo')
- qtbot.keyPress(code_editor, Qt.Key_Enter)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter)
qtbot.keyClicks(code_editor, 'foo.s')
code_editor.document_did_change()
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
qtbot.wait(500)
assert code_editor.toPlainText() == 'import foo\nfoo.s'
@@ -1109,9 +1109,9 @@ def spam():
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
assert "spam()" in [x['label'] for x in sig.args[0]]
assert code_editor.toPlainText() == 'import foo\nfoo.spam'
@@ -1158,7 +1158,7 @@ def test_completions_environment(completions_codeeditor, qtbot, tmpdir):
qtbot.wait(2000)
qtbot.keyClicks(code_editor, 'import flas')
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
qtbot.wait(2000)
assert code_editor.toPlainText() == 'import flas'
@@ -1171,9 +1171,9 @@ def test_completions_environment(completions_codeeditor, qtbot, tmpdir):
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000) as sig:
qtbot.keyClicks(code_editor, 'import flas')
- qtbot.keyPress(code_editor, Qt.Key_Tab)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab)
- qtbot.keyPress(completion, Qt.Key_Tab)
+ qtbot.keyPress(completion, Qt.Key.Key_Tab)
assert "flask" in [x['label'] for x in sig.args[0]]
assert code_editor.toPlainText() == 'import flask'
@@ -1197,7 +1197,7 @@ def test_dot_completions(completions_codeeditor, qtbot):
# Import module and check completions are shown for it after writing a dot
# after it
qtbot.keyClicks(code_editor, "import math")
- qtbot.keyPress(code_editor, Qt.Key_Enter)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Enter)
qtbot.wait(500)
assert not completion.isVisible()
@@ -1246,7 +1246,7 @@ def test_completions_for_files_that_start_with_numbers(
with qtbot.waitSignal(completion.sig_show_completions,
timeout=10000):
- qtbot.keyPress(code_editor, Qt.Key_Tab, delay=300)
+ qtbot.keyPress(code_editor, Qt.Key.Key_Tab, delay=300)
qtbot.wait(500)
assert code_editor.get_text_with_eol() == f"'{file_name}'"
diff --git a/spyder/plugins/editor/widgets/tests/test_panels.py b/spyder/plugins/editor/widgets/tests/test_panels.py
index 42189d3cfcb..e7d39505f98 100644
--- a/spyder/plugins/editor/widgets/tests/test_panels.py
+++ b/spyder/plugins/editor/widgets/tests/test_panels.py
@@ -56,7 +56,7 @@ def _draw_red(self, top, painter):
painter.setPen(QColor('white'))
font_height = self.editor.fontMetrics().height()
painter.drawText(0, top, self.sizeHint().width(),
- font_height, int(Qt.AlignRight | Qt.AlignBottom),
+ font_height, int(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignBottom),
'👀')
def paintEvent(self, event):
diff --git a/spyder/plugins/editor/widgets/tests/test_save.py b/spyder/plugins/editor/widgets/tests/test_save.py
index 1d20f21b310..6c534584420 100644
--- a/spyder/plugins/editor/widgets/tests/test_save.py
+++ b/spyder/plugins/editor/widgets/tests/test_save.py
@@ -509,7 +509,7 @@ def test_save_when_completions_are_visible(completions_editor, qtbot):
# Press keyboard shortcut corresponding to save
qtbot.keyPress(
- completion, Qt.Key_S, modifier=Qt.ControlModifier, delay=300)
+ completion, Qt.Key.Key_S, modifier=Qt.ControlModifier, delay=300)
# Assert file was saved
with open(file_path, 'r') as f:
diff --git a/spyder/plugins/editor/widgets/tests/test_shortcuts.py b/spyder/plugins/editor/widgets/tests/test_shortcuts.py
index cb63eee2d61..502ffc42ce9 100644
--- a/spyder/plugins/editor/widgets/tests/test_shortcuts.py
+++ b/spyder/plugins/editor/widgets/tests/test_shortcuts.py
@@ -88,11 +88,11 @@ def test_start_and_end_of_document_shortcuts(editor_bot):
assert editor.get_cursor_line_column() == (0, 0)
# Go to the end of the document.
- qtbot.keyClick(editor, Qt.Key_End, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_End, modifier=Qt.ControlModifier)
assert editor.get_cursor_line_column() == (4, 0)
# Go to the start of the document.
- qtbot.keyClick(editor, Qt.Key_Home, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Home, modifier=Qt.ControlModifier)
assert editor.get_cursor_line_column() == (0, 0)
@@ -110,20 +110,20 @@ def test_del_undo_redo_shortcuts(editor_bot):
editor = editorstack.get_current_editor()
# Delete the first character of the first line.
- qtbot.keyClick(editor, Qt.Key_Delete)
+ qtbot.keyClick(editor, Qt.Key.Key_Delete)
assert editor.toPlainText() == 'ine1\nLine2\nLine3\nLine4\n'
# Undo the last action with Ctrl+Z.
- qtbot.keyClick(editor, Qt.Key_Z, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Z, modifier=Qt.ControlModifier)
assert editor.toPlainText() == 'Line1\nLine2\nLine3\nLine4\n'
# Redo the last action with Ctrl+Shift+Z .
- qtbot.keyClick(editor, Qt.Key_Z,
+ qtbot.keyClick(editor, Qt.Key.Key_Z,
modifier=Qt.ControlModifier | Qt.ShiftModifier)
assert editor.toPlainText() == 'ine1\nLine2\nLine3\nLine4\n'
# Undo the last action again with Ctrl+Z.
- qtbot.keyClick(editor, Qt.Key_Z, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Z, modifier=Qt.ControlModifier)
assert editor.toPlainText() == 'Line1\nLine2\nLine3\nLine4\n'
@@ -140,23 +140,23 @@ def test_copy_cut_paste_shortcuts(editor_bot):
QApplication.clipboard().clear()
# Select and Copy the first line in the editor.
- qtbot.keyClick(editor, Qt.Key_End, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_End, modifier=Qt.ShiftModifier)
assert editor.get_selected_text() == 'Line1'
- qtbot.keyClick(editor, Qt.Key_C, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_C, modifier=Qt.ControlModifier)
assert QApplication.clipboard().text() == 'Line1'
# Paste the selected text.
- qtbot.keyClick(editor, Qt.Key_Home)
- qtbot.keyClick(editor, Qt.Key_V, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Home)
+ qtbot.keyClick(editor, Qt.Key.Key_V, modifier=Qt.ControlModifier)
assert editor.toPlainText() == 'Line1Line1\nLine2\nLine3\nLine4\n'
# Select and Cut the first line in the editor.
- qtbot.keyClick(editor, Qt.Key_Home)
- qtbot.keyClick(editor, Qt.Key_End, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Home)
+ qtbot.keyClick(editor, Qt.Key.Key_End, modifier=Qt.ShiftModifier)
assert editor.get_selected_text() == 'Line1Line1'
- qtbot.keyClick(editor, Qt.Key_X, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_X, modifier=Qt.ControlModifier)
assert QApplication.clipboard().text() == 'Line1Line1'
assert editor.toPlainText() == '\nLine2\nLine3\nLine4\n'
@@ -173,7 +173,7 @@ def test_select_all_shortcut(editor_bot):
editor = editorstack.get_current_editor()
# Select all the text in the editor.
- qtbot.keyClick(editor, Qt.Key_A, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_A, modifier=Qt.ControlModifier)
assert editor.get_selected_text() == 'Line1\nLine2\nLine3\nLine4\n'
@@ -191,7 +191,7 @@ def test_delete_line_shortcut(editor_bot):
# Delete the second line in the editor.
editor.go_to_line(2)
- qtbot.keyClick(editor, Qt.Key_D, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_D, modifier=Qt.ControlModifier)
assert editor.toPlainText() == 'Line1\nLine3\nLine4\n'
@@ -206,12 +206,12 @@ def test_go_to_line_shortcut(editor_bot, mocker):
"""
editorstack, qtbot = editor_bot
editor = editorstack.get_current_editor()
- qtbot.keyClick(editor, Qt.Key_Home, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Home, modifier=Qt.ControlModifier)
# Go to line 3.
mocker.patch.object(GoToLineDialog, 'exec_', return_value=True)
mocker.patch.object(GoToLineDialog, 'get_line_number', return_value=3)
- qtbot.keyClick(editor, Qt.Key_L, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_L, modifier=Qt.ControlModifier)
assert editor.get_cursor_line_column() == (2, 0)
@@ -228,8 +228,8 @@ def test_transform_to_lowercase_shortcut(editor_bot):
editor = editorstack.get_current_editor()
# Transform all the text to lowercase.
- qtbot.keyClick(editor, Qt.Key_A, modifier=Qt.ControlModifier)
- qtbot.keyClick(editor, Qt.Key_U, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_A, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_U, modifier=Qt.ControlModifier)
assert editor.toPlainText() == 'line1\nline2\nline3\nline4\n'
@@ -246,8 +246,8 @@ def test_transform_to_uppercase_shortcut(editor_bot):
editor = editorstack.get_current_editor()
# Transform all the text to uppercase.
- qtbot.keyClick(editor, Qt.Key_A, modifier=Qt.ControlModifier)
- qtbot.keyClick(editor, Qt.Key_U,
+ qtbot.keyClick(editor, Qt.Key.Key_A, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_U,
modifier=Qt.ControlModifier | Qt.ShiftModifier)
assert editor.toPlainText() == 'LINE1\nLINE2\nLINE3\nLINE4\n'
@@ -266,19 +266,19 @@ def test_next_and_previous_word_shortcuts(editor_bot):
# Go to the next word 3 times.
assert editor.get_cursor_line_column() == (0, 0)
- qtbot.keyClick(editor, Qt.Key_Right, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Right, modifier=Qt.ControlModifier)
assert editor.get_cursor_line_column() == (0, 5)
- qtbot.keyClick(editor, Qt.Key_Right, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Right, modifier=Qt.ControlModifier)
assert editor.get_cursor_line_column() == (1, 0)
- qtbot.keyClick(editor, Qt.Key_Right, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Right, modifier=Qt.ControlModifier)
assert editor.get_cursor_line_column() == (1, 5)
# Go to the previous word 3 times.
- qtbot.keyClick(editor, Qt.Key_Left, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Left, modifier=Qt.ControlModifier)
assert editor.get_cursor_line_column() == (1, 0)
- qtbot.keyClick(editor, Qt.Key_Left, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Left, modifier=Qt.ControlModifier)
assert editor.get_cursor_line_column() == (0, 5)
- qtbot.keyClick(editor, Qt.Key_Left, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Left, modifier=Qt.ControlModifier)
assert editor.get_cursor_line_column() == (0, 0)
@@ -296,24 +296,24 @@ def test_builtin_shift_del_and_ins(editor_bot):
QApplication.clipboard().clear()
# Select the first line of the editor.
- qtbot.keyClick(editor, Qt.Key_End, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_End, modifier=Qt.ShiftModifier)
assert editor.get_selected_text() == 'Line1'
# Copy the selection with Ctrl+Ins.
- qtbot.keyClick(editor, Qt.Key_Insert, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Insert, modifier=Qt.ControlModifier)
assert QApplication.clipboard().text() == 'Line1'
# Paste the copied text at the end of the line with Shift+Ins.
- qtbot.keyClick(editor, Qt.Key_End)
- qtbot.keyClick(editor, Qt.Key_Insert, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_End)
+ qtbot.keyClick(editor, Qt.Key.Key_Insert, modifier=Qt.ShiftModifier)
assert editor.toPlainText() == 'Line1Line1\nLine2\nLine3\nLine4\n'
# Select the second line in the editor again.
- qtbot.keyClick(editor, Qt.Key_Home, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Home, modifier=Qt.ShiftModifier)
assert editor.get_selected_text() == 'Line1Line1'
# Cut the selection with Shift+Del.
- qtbot.keyClick(editor, Qt.Key_Delete, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Delete, modifier=Qt.ShiftModifier)
assert QApplication.clipboard().text() == 'Line1Line1'
assert editor.toPlainText() == '\nLine2\nLine3\nLine4\n'
@@ -330,24 +330,24 @@ def test_builtin_undo_redo(editor_bot):
# Write something on a new line.
qtbot.keyClicks(editor, 'Something')
- qtbot.keyClick(editor, Qt.Key_Return)
+ qtbot.keyClick(editor, Qt.Key.Key_Return)
assert editor.toPlainText() == 'Something\nLine1\nLine2\nLine3\nLine4\n'
# Undo the last action with Alt+Backspace.
- qtbot.keyClick(editor, Qt.Key_Backspace, modifier=Qt.AltModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Backspace, modifier=Qt.AltModifier)
assert editor.toPlainText() == 'SomethingLine1\nLine2\nLine3\nLine4\n'
# Undo the second to last action with Alt+Backspace.
- qtbot.keyClick(editor, Qt.Key_Backspace, modifier=Qt.AltModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Backspace, modifier=Qt.AltModifier)
assert editor.toPlainText() == 'Line1\nLine2\nLine3\nLine4\n'
# Redo the second to last action with Alt+Shift+Backspace.
- qtbot.keyClick(editor, Qt.Key_Backspace,
+ qtbot.keyClick(editor, Qt.Key.Key_Backspace,
modifier=Qt.AltModifier | Qt.ShiftModifier)
assert editor.toPlainText() == 'SomethingLine1\nLine2\nLine3\nLine4\n'
# Redo the last action with Ctrl+Y.
- qtbot.keyClick(editor, Qt.Key_Y, modifier=Qt.ControlModifier)
+ qtbot.keyClick(editor, Qt.Key.Key_Y, modifier=Qt.ControlModifier)
assert editor.toPlainText() == 'Something\nLine1\nLine2\nLine3\nLine4\n'
diff --git a/spyder/plugins/editor/widgets/tests/test_warnings.py b/spyder/plugins/editor/widgets/tests/test_warnings.py
index 2aa62888710..bd1af0d98d4 100644
--- a/spyder/plugins/editor/widgets/tests/test_warnings.py
+++ b/spyder/plugins/editor/widgets/tests/test_warnings.py
@@ -287,7 +287,7 @@ def test_update_warnings_after_closequotes(qtbot, completions_codeeditor_linting
with qtbot.waitSignal(editor.completions_response_signal, timeout=30000):
# Add a single quote to fix the error
editor.move_cursor(-2)
- qtbot.keyPress(editor, Qt.Key_Apostrophe)
+ qtbot.keyPress(editor, Qt.Key.Key_Apostrophe)
assert editor.toPlainText() == "print('test')\n"
# Assert that the error is gone.
@@ -333,7 +333,7 @@ def test_update_warnings_after_closebrackets(qtbot, completions_codeeditor_linti
with qtbot.waitSignal(editor.completions_response_signal, timeout=30000):
# Add a bracket to fix the error
editor.move_cursor(-1)
- qtbot.keyPress(editor, Qt.Key_ParenRight)
+ qtbot.keyPress(editor, Qt.Key.Key_ParenRight)
assert editor.toPlainText() == "print('test')\n"
# Assert that the error is gone.
diff --git a/spyder/plugins/explorer/widgets/explorer.py b/spyder/plugins/explorer/widgets/explorer.py
index 1757ba88588..12b3916af4a 100644
--- a/spyder/plugins/explorer/widgets/explorer.py
+++ b/spyder/plugins/explorer/widgets/explorer.py
@@ -776,13 +776,13 @@ def contextMenuEvent(self, event):
def keyPressEvent(self, event):
"""Reimplement Qt method"""
- if event.key() in (Qt.Key_Enter, Qt.Key_Return):
+ if event.key() in (Qt.Key.Key_Enter, Qt.Key.Key_Return):
self.clicked()
- elif event.key() == Qt.Key_F2:
+ elif event.key() == Qt.Key.Key_F2:
self.rename()
- elif event.key() == Qt.Key_Delete:
+ elif event.key() == Qt.Key.Key_Delete:
self.delete()
- elif event.key() == Qt.Key_Backspace:
+ elif event.key() == Qt.Key.Key_Backspace:
self.go_to_parent_directory()
else:
QTreeView.keyPressEvent(self, event)
@@ -831,10 +831,10 @@ def mouseMoveEvent(self, event):
if event.pos().x() > item_identation:
# When hovering over directories or files
- self.setCursor(Qt.PointingHandCursor)
+ self.setCursor(Qt.CursorShape.PointingHandCursor)
else:
# On every other element
- self.setCursor(Qt.ArrowCursor)
+ self.setCursor(Qt.CursorShape.ArrowCursor)
self.setToolTip(self.get_filename(index))
diff --git a/spyder/plugins/explorer/widgets/fileassociations.py b/spyder/plugins/explorer/widgets/fileassociations.py
index 2ea7eef8670..1f7eb8c9fe0 100644
--- a/spyder/plugins/explorer/widgets/fileassociations.py
+++ b/spyder/plugins/explorer/widgets/fileassociations.py
@@ -146,7 +146,7 @@ def __init__(self, parent=None):
def setup(self, applications=None):
"""Load installed applications."""
- QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+ QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
self.list.clear()
if applications is None:
apps = get_installed_applications()
diff --git a/spyder/plugins/explorer/widgets/main_widget.py b/spyder/plugins/explorer/widgets/main_widget.py
index 2985e729880..d7285eb4522 100644
--- a/spyder/plugins/explorer/widgets/main_widget.py
+++ b/spyder/plugins/explorer/widgets/main_widget.py
@@ -325,15 +325,15 @@ def __init__(self, directory=None, file_associations={}):
self.label_dir = QLabel("Open dir:")
self.label_file = QLabel("Open file:")
self.label1 = QLabel()
- self.label_dir.setAlignment(Qt.AlignRight)
+ self.label_dir.setAlignment(Qt.AlignmentFlag.AlignRight)
self.label2 = QLabel()
self.label_option = QLabel("Option changed:")
self.label3 = QLabel()
# Setup
self.explorer.set_current_folder(self.directory)
- self.label_file.setAlignment(Qt.AlignRight)
- self.label_option.setAlignment(Qt.AlignRight)
+ self.label_file.setAlignment(Qt.AlignmentFlag.AlignRight)
+ self.label_option.setAlignment(Qt.AlignmentFlag.AlignRight)
# Layout
hlayout1 = QHBoxLayout()
diff --git a/spyder/plugins/explorer/widgets/tests/test_explorer.py b/spyder/plugins/explorer/widgets/tests/test_explorer.py
index 52d01cb9707..10d162deb42 100644
--- a/spyder/plugins/explorer/widgets/tests/test_explorer.py
+++ b/spyder/plugins/explorer/widgets/tests/test_explorer.py
@@ -176,7 +176,7 @@ def test_single_click_to_open(qtbot, file_explorer):
treewidget = file_explorer.explorer.treewidget
model = treewidget.model()
cwd = os.getcwd()
- qtbot.keyClick(treewidget, Qt.Key_Up) # To focus and select the 1st item
+ qtbot.keyClick(treewidget, Qt.Key.Key_Up) # To focus and select the 1st item
initial_index = treewidget.currentIndex() # To keep a reference
def run_test_helper(single_click, initial_index):
@@ -186,7 +186,7 @@ def run_test_helper(single_click, initial_index):
file_explorer.label1.setText('')
for __ in range(4): # 4 items inside `/spyder/plugins/explorer/`
- qtbot.keyClick(treewidget, Qt.Key_Down)
+ qtbot.keyClick(treewidget, Qt.Key.Key_Down)
index = treewidget.currentIndex()
path = model.data(index)
if path:
@@ -196,7 +196,7 @@ def run_test_helper(single_click, initial_index):
rect = treewidget.visualRect(index)
pos = rect.center()
qtbot.mouseClick(
- treewidget.viewport(), Qt.LeftButton, pos=pos)
+ treewidget.viewport(), Qt.MouseButton.LeftButton, pos=pos)
if single_click:
assert full_path == file_explorer.label1.text()
@@ -284,16 +284,16 @@ def test_clicked(qtbot, file_explorer_associations, tmp_path):
qtbot.wait(500)
# Select first item
- qtbot.keyClick(widget, Qt.Key_Up)
+ qtbot.keyClick(widget, Qt.Key.Key_Up)
# Test click
def interact():
msgbox = widget.findChild(QMessageBox)
assert msgbox
- qtbot.keyClick(msgbox, Qt.Key_Return)
+ qtbot.keyClick(msgbox, Qt.Key.Key_Return)
_ = create_timer(interact)
- qtbot.keyClick(widget, Qt.Key_Return)
+ qtbot.keyClick(widget, Qt.Key.Key_Return)
# Test no message box
def interact_2():
@@ -302,7 +302,7 @@ def interact_2():
widget.set_file_associations({})
_ = create_timer(interact_2)
- qtbot.keyClick(widget, Qt.Key_Return)
+ qtbot.keyClick(widget, Qt.Key.Key_Return)
@pytest.mark.order(1)
@@ -317,7 +317,7 @@ def test_check_launch_error_codes(qtbot, file_explorer_associations):
def interact():
msgbox = widget.findChild(QMessageBox)
assert msgbox
- qtbot.keyClick(msgbox, Qt.Key_Return)
+ qtbot.keyClick(msgbox, Qt.Key.Key_Return)
return_codes = {'some-command': 1}
_ = create_timer(interact)
@@ -328,7 +328,7 @@ def interact():
def interact_2():
msgbox = widget.findChild(QMessageBox)
assert msgbox
- qtbot.keyClick(msgbox, Qt.Key_Return)
+ qtbot.keyClick(msgbox, Qt.Key.Key_Return)
return_codes = {'some-command': 1, 'some-other-command': 1}
_ = create_timer(interact_2)
@@ -345,12 +345,12 @@ def test_open_association(qtbot, file_explorer_associations, tmp_path):
fpath.write_text(u'hello!')
# Select first item
- qtbot.keyClick(widget, Qt.Key_Down)
+ qtbot.keyClick(widget, Qt.Key.Key_Down)
def interact():
msgbox = widget.findChild(QMessageBox)
assert msgbox
- qtbot.keyClick(msgbox, Qt.Key_Return)
+ qtbot.keyClick(msgbox, Qt.Key.Key_Return)
_ = create_timer(interact)
widget.open_association('some-app')
diff --git a/spyder/plugins/explorer/widgets/tests/test_fileassociations.py b/spyder/plugins/explorer/widgets/tests/test_fileassociations.py
index 56a32389d80..aa5561acd54 100644
--- a/spyder/plugins/explorer/widgets/tests/test_fileassociations.py
+++ b/spyder/plugins/explorer/widgets/tests/test_fileassociations.py
@@ -159,20 +159,20 @@ def interact_with_dialog_1():
qtbot.keyClicks(widget._dlg_input.lineedit, extension)
assert widget._dlg_input.lineedit.text() == extension
assert not widget._dlg_input.button_ok.isEnabled()
- qtbot.keyClick(widget._dlg_input.button_cancel, Qt.Key_Return)
+ qtbot.keyClick(widget._dlg_input.button_cancel, Qt.Key.Key_Return)
_ = create_timer(interact_with_dialog_1)
- qtbot.mouseClick(widget.button_add, Qt.LeftButton)
+ qtbot.mouseClick(widget.button_add, Qt.MouseButton.LeftButton)
# Test add valid association
extension = '*.zpam,MANIFEST.in'
def interact_with_dialog_2():
qtbot.keyClicks(widget._dlg_input.lineedit, extension)
- qtbot.keyClick(widget._dlg_input.button_ok, Qt.Key_Return)
+ qtbot.keyClick(widget._dlg_input.button_ok, Qt.Key.Key_Return)
_ = create_timer(interact_with_dialog_2)
- qtbot.mouseClick(widget.button_add, Qt.LeftButton)
+ qtbot.mouseClick(widget.button_add, Qt.MouseButton.LeftButton)
assert widget.list_extensions.count() == 3
assert widget.list_extensions.item(2).text() == extension
@@ -196,20 +196,20 @@ def interact_with_dialog_2():
def interact_with_dialog_3():
widget._dlg_input.lineedit.clear()
qtbot.keyClicks(widget._dlg_input.lineedit, extension)
- qtbot.keyClick(widget._dlg_input.button_ok, Qt.Key_Return)
+ qtbot.keyClick(widget._dlg_input.button_ok, Qt.Key.Key_Return)
_ = create_timer(interact_with_dialog_3)
- qtbot.mouseClick(widget.button_edit, Qt.LeftButton)
+ qtbot.mouseClick(widget.button_edit, Qt.MouseButton.LeftButton)
assert widget.list_extensions.count() == 4
assert widget.list_extensions.item(2).text() == extension
# Test remove associations
- qtbot.mouseClick(widget.button_remove, Qt.LeftButton)
+ qtbot.mouseClick(widget.button_remove, Qt.MouseButton.LeftButton)
assert widget.list_extensions.count() == 3
# Test set default
widget.list_applications.setCurrentRow(1)
- qtbot.mouseClick(widget.button_default, Qt.LeftButton)
+ qtbot.mouseClick(widget.button_default, Qt.MouseButton.LeftButton)
assert 'App name 2' in widget.list_applications.item(0).text()
# Test add application
@@ -218,13 +218,13 @@ def interact_with_dialog_4():
count = widget._dlg_applications.list.count()
if count > 0:
widget._dlg_applications.list.setCurrentRow(count - 1)
- qtbot.keyClick(widget._dlg_applications.button_ok, Qt.Key_Return)
+ qtbot.keyClick(widget._dlg_applications.button_ok, Qt.Key.Key_Return)
else:
qtbot.keyClick(widget._dlg_applications.button_cancel,
- Qt.Key_Return)
+ Qt.Key.Key_Return)
_ = create_timer(interact_with_dialog_4)
- qtbot.mouseClick(widget.button_add_application, Qt.LeftButton)
+ qtbot.mouseClick(widget.button_add_application, Qt.MouseButton.LeftButton)
count = widget.list_applications.count()
assert count in [2, 3]
@@ -236,7 +236,7 @@ def interact_with_dialog_4():
# Test remove application
widget.list_applications.setCurrentRow(0)
- qtbot.mouseClick(widget.button_remove_application, Qt.LeftButton)
+ qtbot.mouseClick(widget.button_remove_application, Qt.MouseButton.LeftButton)
count = widget.list_applications.count()
assert count in [1, 2]
assert 'App name 1' in widget.list_applications.item(0).text()
diff --git a/spyder/plugins/findinfiles/plugin.py b/spyder/plugins/findinfiles/plugin.py
index a362a4d223e..6bde6455b70 100644
--- a/spyder/plugins/findinfiles/plugin.py
+++ b/spyder/plugins/findinfiles/plugin.py
@@ -64,7 +64,7 @@ def on_initialize(self):
tip=_("Search text in multiple files"),
triggered=self.find,
register_shortcut=True,
- context=Qt.WindowShortcut
+ context=Qt.ShortcutContext.WindowShortcut
)
self.refresh_search_directory()
diff --git a/spyder/plugins/findinfiles/widgets/combobox.py b/spyder/plugins/findinfiles/widgets/combobox.py
index 2a74de27cb3..5e10e016d34 100644
--- a/spyder/plugins/findinfiles/widgets/combobox.py
+++ b/spyder/plugins/findinfiles/widgets/combobox.py
@@ -201,7 +201,7 @@ def set_project_path(self, path):
def eventFilter(self, widget, event):
"""Used to handle key events on the QListView of the combobox."""
- if event.type() == QEvent.KeyPress and event.key() == Qt.Key_Delete:
+ if event.type() == QEvent.KeyPress and event.key() == Qt.Key.Key_Delete:
index = self.view().currentIndex().row()
if index >= EXTERNAL_PATHS:
# Remove item and update the view.
diff --git a/spyder/plugins/findinfiles/widgets/tests/test_widgets.py b/spyder/plugins/findinfiles/widgets/tests/test_widgets.py
index a8d552c608e..3cf0fcef0a2 100644
--- a/spyder/plugins/findinfiles/widgets/tests/test_widgets.py
+++ b/spyder/plugins/findinfiles/widgets/tests/test_widgets.py
@@ -467,7 +467,7 @@ def test_delete_path(searchin_combobox, qtbot, mocker):
for i in range(EXTERNAL_PATHS):
searchin_combobox.view().setCurrentIndex(
searchin_combobox.model().index(i, 0))
- qtbot.keyPress(searchin_combobox.view(), Qt.Key_Delete)
+ qtbot.keyPress(searchin_combobox.view(), Qt.Key.Key_Delete)
assert searchin_combobox.count() == len(expected_results)+EXTERNAL_PATHS
assert searchin_combobox.get_external_paths() == expected_results
@@ -476,7 +476,7 @@ def test_delete_path(searchin_combobox, qtbot, mocker):
# Delete the first external path in the list.
searchin_combobox.view().setCurrentIndex(
searchin_combobox.model().index(EXTERNAL_PATHS, 0))
- qtbot.keyPress(searchin_combobox.view(), Qt.Key_Delete)
+ qtbot.keyPress(searchin_combobox.view(), Qt.Key.Key_Delete)
expected_results.pop(0)
assert searchin_combobox.count() == len(expected_results)+EXTERNAL_PATHS
@@ -487,7 +487,7 @@ def test_delete_path(searchin_combobox, qtbot, mocker):
# Delete the second external path in the remaining list.
searchin_combobox.view().setCurrentIndex(
searchin_combobox.model().index(EXTERNAL_PATHS+1, 0))
- qtbot.keyPress(searchin_combobox.view(), Qt.Key_Delete)
+ qtbot.keyPress(searchin_combobox.view(), Qt.Key.Key_Delete)
expected_results.pop(1)
assert searchin_combobox.count() == len(expected_results)+EXTERNAL_PATHS
@@ -498,7 +498,7 @@ def test_delete_path(searchin_combobox, qtbot, mocker):
# Delete the last external path in the list.
searchin_combobox.view().setCurrentIndex(
searchin_combobox.model().index(searchin_combobox.count()-1, 0))
- qtbot.keyPress(searchin_combobox.view(), Qt.Key_Delete)
+ qtbot.keyPress(searchin_combobox.view(), Qt.Key.Key_Delete)
expected_results.pop()
assert searchin_combobox.count() == len(expected_results)+EXTERNAL_PATHS
@@ -510,7 +510,7 @@ def test_delete_path(searchin_combobox, qtbot, mocker):
# Delete the last remaining external path in the list.
searchin_combobox.view().setCurrentIndex(
searchin_combobox.model().index(EXTERNAL_PATHS, 0))
- qtbot.keyPress(searchin_combobox.view(), Qt.Key_Delete)
+ qtbot.keyPress(searchin_combobox.view(), Qt.Key.Key_Delete)
assert searchin_combobox.count() == EXTERNAL_PATHS
assert searchin_combobox.get_external_paths() == []
diff --git a/spyder/plugins/ipythonconsole/confpage.py b/spyder/plugins/ipythonconsole/confpage.py
index 16ade0d481b..02728828052 100644
--- a/spyder/plugins/ipythonconsole/confpage.py
+++ b/spyder/plugins/ipythonconsole/confpage.py
@@ -202,7 +202,7 @@ def setup_page(self):
"import os; import sys"))
run_lines_label.setWordWrap(True)
run_lines_edit = self.create_lineedit(_("Lines:"), 'startup/run_lines',
- '', alignment=Qt.Horizontal)
+ '', alignment=Qt.Orientation.Horizontal)
run_lines_layout = QVBoxLayout()
run_lines_layout.addWidget(run_lines_label)
@@ -238,7 +238,7 @@ def setup_page(self):
"import matplotlib.pyplot as plt"))
pdb_run_lines_label.setWordWrap(True)
pdb_run_lines_edit = self.create_lineedit(
- _("Lines:"), 'startup/pdb_run_lines', '', alignment=Qt.Horizontal)
+ _("Lines:"), 'startup/pdb_run_lines', '', alignment=Qt.Orientation.Horizontal)
pdb_run_lines_layout = QVBoxLayout()
pdb_run_lines_layout.addWidget(pdb_run_lines_label)
@@ -388,14 +388,14 @@ def setup_page(self):
_('Default is
'
'In [<span class="in-prompt-number">'
'%i</span>]:'),
- alignment=Qt.Horizontal)
+ alignment=Qt.Orientation.Horizontal)
out_prompt_edit = self.create_lineedit(
_("Output prompt:"),
'out_prompt', '',
_('Default is
'
'Out[<span class="out-prompt-number">'
'%i</span>]:'),
- alignment=Qt.Horizontal)
+ alignment=Qt.Orientation.Horizontal)
prompts_layout = QVBoxLayout()
prompts_layout.addWidget(prompts_label)
diff --git a/spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py b/spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py
index 2ec718cc012..135dd8edc4b 100644
--- a/spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py
+++ b/spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py
@@ -534,16 +534,16 @@ def test_save_history_dbg(ipyconsole, qtbot):
# Enter an expression
with qtbot.waitSignal(shell.executed):
qtbot.keyClicks(control, 'aa = 10')
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Add a pdb command to make sure it is not saved
with qtbot.waitSignal(shell.executed):
qtbot.keyClicks(control, '!u')
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Add an empty line to make sure it is not saved
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Clear console (for some reason using shell.clear_console
# doesn't work here)
@@ -555,7 +555,7 @@ def test_save_history_dbg(ipyconsole, qtbot):
# Press Up arrow button and assert we get the last
# introduced command
- qtbot.keyClick(control, Qt.Key_Up)
+ qtbot.keyClick(control, Qt.Key.Key_Up)
assert 'aa = 10' in control.toPlainText()
# Open new widget
@@ -575,21 +575,21 @@ def test_save_history_dbg(ipyconsole, qtbot):
# Press Up arrow button and assert we get the last
# introduced command
- qtbot.keyClick(control, Qt.Key_Up)
+ qtbot.keyClick(control, Qt.Key.Key_Up)
assert 'aa = 10' in control.toPlainText()
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Add a multiline statment and ckeck we can browse it correctly
shell._pdb_history.append('if True:\n print(1)')
shell._pdb_history.append('print(2)')
shell._pdb_history.append('if True:\n print(10)')
shell._pdb_history_index = len(shell._pdb_history)
# The continuation prompt is here
- qtbot.keyClick(control, Qt.Key_Up)
+ qtbot.keyClick(control, Qt.Key.Key_Up)
assert '...: print(10)' in control.toPlainText()
shell._control.set_cursor_position(shell._control.get_position('eof') - 25)
- qtbot.keyClick(control, Qt.Key_Up)
+ qtbot.keyClick(control, Qt.Key.Key_Up)
assert '...: print(1)' in control.toPlainText()
@@ -739,7 +739,7 @@ def test_execute_events_dbg(ipyconsole, qtbot):
# Test reset magic
qtbot.keyClicks(control, 'plt.plot(range(10))')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Assert that there's a plot in the console
assert shell._control.toHtml().count('img src') == 1
@@ -751,7 +751,7 @@ def test_execute_events_dbg(ipyconsole, qtbot):
# Test reset magic
qtbot.keyClicks(control, 'plt.plot(range(10))')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Assert that there's no new plots in the console
assert shell._control.toHtml().count('img src') == 1
@@ -759,7 +759,7 @@ def test_execute_events_dbg(ipyconsole, qtbot):
# Test if the plot is shown with plt.show()
qtbot.keyClicks(control, 'plt.show()')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Assert that there's a new plots in the console
assert shell._control.toHtml().count('img src') == 2
@@ -853,7 +853,7 @@ def test_clear_and_reset_magics_dbg(ipyconsole, qtbot):
# Test reset magic
qtbot.keyClicks(control, 'bb = 10')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
assert shell.get_value('bb') == 10
shell.reset_namespace()
@@ -861,7 +861,7 @@ def test_clear_and_reset_magics_dbg(ipyconsole, qtbot):
qtbot.keyClicks(control, 'bb')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
assert "*** NameError: name 'bb' is not defined" in control.toPlainText()
@@ -1172,7 +1172,7 @@ def check_value(name, value):
qtbot.wait(500)
qtbot.keyClicks(control, 'cb')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
# Jedi completion takes time to start up the first time
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'cbs',
timeout=6000)
@@ -1182,11 +1182,11 @@ def check_value(name, value):
shell.execute('cbba = 1')
qtbot.waitUntil(lambda: check_value('cbba', 1))
qtbot.keyClicks(control, 'cb')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(shell._completion_widget.isVisible)
# cbs is another solution, so not completed yet
assert control.toPlainText().split()[-1] == 'cb'
- qtbot.keyClick(shell._completion_widget, Qt.Key_Enter)
+ qtbot.keyClick(shell._completion_widget, Qt.Key.Key_Enter)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'cbba')
# Enter debugging mode
@@ -1196,75 +1196,75 @@ def check_value(name, value):
# Test complete in debug mode
# check abs is completed twice (as the cursor moves)
qtbot.keyClicks(control, 'ab')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'abs')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# A second time to check a function call doesn't cause a problem
qtbot.keyClicks(control, 'print(ab')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(
lambda: control.toPlainText().split()[-1] == 'print(abs')
qtbot.keyClicks(control, ')')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Enter an expression
qtbot.keyClicks(control, 'baab = 10')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
qtbot.wait(100)
qtbot.waitUntil(lambda: check_value('baab', 10))
# Check baab is completed
qtbot.keyClicks(control, 'baa')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'baab')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Check the completion widget is shown for abba, abs
qtbot.keyClicks(control, 'abba = 10')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
qtbot.wait(100)
qtbot.waitUntil(lambda: check_value('abba', 10))
qtbot.keyClicks(control, 'ab')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(shell._completion_widget.isVisible)
assert control.toPlainText().split()[-1] == 'ab'
- qtbot.keyClick(shell._completion_widget, Qt.Key_Enter)
+ qtbot.keyClick(shell._completion_widget, Qt.Key.Key_Enter)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'abba')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Create a class
qtbot.keyClicks(control, 'class A(): baba = 1')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
qtbot.wait(100)
qtbot.waitUntil(lambda: shell.is_defined('A'))
qtbot.keyClicks(control, 'a = A()')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
qtbot.wait(100)
qtbot.waitUntil(lambda: shell.is_defined('a'))
# Check we can complete attributes
qtbot.keyClicks(control, 'a.ba')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'a.baba')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Check we can complete pdb command names
qtbot.keyClicks(control, '!longl')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == '!longlist')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Check we can use custom complete for pdb
test_file = tmpdir.join('test.py')
@@ -1272,10 +1272,10 @@ def check_value(name, value):
# Set a breakpoint in the new file
qtbot.keyClicks(control, '!b ' + str(test_file) + ':1')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
# Check we can complete the breakpoint number
qtbot.keyClicks(control, '!ignore ')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == '1')
@@ -1295,12 +1295,12 @@ def test_pdb_multiline(ipyconsole, qtbot):
# Test reset magic
qtbot.keyClicks(control, 'if True:')
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
qtbot.wait(500)
qtbot.keyClicks(control, 'bb = 10')
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
qtbot.wait(500)
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
qtbot.wait(500)
assert shell.get_value('bb') == 10
@@ -1325,12 +1325,12 @@ def test_pdb_ignore_lib(ipyconsole, qtbot, show_lib):
qtbot.keyClicks(control, '!s')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
qtbot.wait(500)
qtbot.keyClicks(control, '!q')
with qtbot.waitSignal(shell.executed):
- qtbot.keyClick(control, Qt.Key_Enter)
+ qtbot.keyClick(control, Qt.Key.Key_Enter)
if show_lib:
assert 'iostream.py' in control.toPlainText()
@@ -1624,7 +1624,7 @@ def test_recursive_pdb(ipyconsole, qtbot):
assert control.toPlainText().split()[-2:] == ["(IPdb", "[2]):"]
# Check completion works
qtbot.keyClicks(control, 'aba')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'abab',
timeout=SHELL_TIMEOUT)
# quit one layer
@@ -1633,7 +1633,7 @@ def test_recursive_pdb(ipyconsole, qtbot):
assert control.toPlainText().split()[-2:] == ["IPdb", "[4]:"]
# Check completion works
qtbot.keyClicks(control, 'aba')
- qtbot.keyClick(control, Qt.Key_Tab)
+ qtbot.keyClick(control, Qt.Key.Key_Tab)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'abab',
timeout=SHELL_TIMEOUT)
with qtbot.waitSignal(shell.executed):
@@ -1659,14 +1659,14 @@ def test_stop_pdb(ipyconsole, qtbot):
shell.execute("import time; time.sleep(10)")
qtbot.wait(500)
with qtbot.waitSignal(shell.executed, timeout=1000):
- qtbot.mouseClick(stop_button, Qt.LeftButton)
+ qtbot.mouseClick(stop_button, Qt.MouseButton.LeftButton)
assert "KeyboardInterrupt" in control.toPlainText()
# We are still in the debugger
assert "IPdb [2]:" in control.toPlainText()
assert "In [2]:" not in control.toPlainText()
# Leave the debugger
with qtbot.waitSignal(shell.executed):
- qtbot.mouseClick(stop_button, Qt.LeftButton)
+ qtbot.mouseClick(stop_button, Qt.MouseButton.LeftButton)
assert "In [2]:" in control.toPlainText()
diff --git a/spyder/plugins/ipythonconsole/widgets/control.py b/spyder/plugins/ipythonconsole/widgets/control.py
index 7c7d1270513..33d1044ed90 100644
--- a/spyder/plugins/ipythonconsole/widgets/control.py
+++ b/spyder/plugins/ipythonconsole/widgets/control.py
@@ -89,7 +89,7 @@ def showEvent(self, event):
def keyPressEvent(self, event):
"""Reimplement Qt Method - Basic keypress event handler"""
event, text, key, ctrl, shift = restore_keyevent(event)
- if (key == Qt.Key_ParenLeft and not self.has_selected_text()
+ if (key == Qt.Key.Key_ParenLeft and not self.has_selected_text()
and self.help_enabled and not self.parent()._reading):
self._key_paren_left(text)
else:
@@ -110,7 +110,7 @@ def mouseMoveEvent(self, event):
"""Detect anchors and change cursor shape accordingly."""
self.anchor = self.anchorAt(event.pos())
if self.anchor:
- QApplication.setOverrideCursor(Qt.PointingHandCursor)
+ QApplication.setOverrideCursor(Qt.CursorShape.PointingHandCursor)
else:
QApplication.restoreOverrideCursor()
super(ControlWidget, self).mouseMoveEvent(event)
@@ -119,7 +119,7 @@ def mouseReleaseEvent(self, event):
"""Ooen anchors when clicked."""
if self.anchor:
QDesktopServices.openUrl(QUrl(self.anchor))
- QApplication.setOverrideCursor(Qt.ArrowCursor)
+ QApplication.setOverrideCursor(Qt.CursorShape.ArrowCursor)
self.anchor = None
else:
super(ControlWidget, self).mouseReleaseEvent(event)
@@ -148,7 +148,7 @@ def keyPressEvent(self, event):
"""Reimplement Qt Method - Basic keypress event handler"""
event, text, key, ctrl, shift = restore_keyevent(event)
- if key == Qt.Key_Slash and self.isVisible():
+ if key == Qt.Key.Key_Slash and self.isVisible():
self.sig_show_find_widget_requested.emit()
else:
# Let the parent widget handle the key press event
diff --git a/spyder/plugins/ipythonconsole/widgets/kernelconnect.py b/spyder/plugins/ipythonconsole/widgets/kernelconnect.py
index 1531c12e80b..4e31af7d76c 100644
--- a/spyder/plugins/ipythonconsole/widgets/kernelconnect.py
+++ b/spyder/plugins/ipythonconsole/widgets/kernelconnect.py
@@ -43,7 +43,7 @@ def __init__(self, parent=None):
"ipythonconsole.html#using-external-kernels\">"
"our documentation."))
main_label.setWordWrap(True)
- main_label.setAlignment(Qt.AlignJustify)
+ main_label.setAlignment(Qt.AlignmentFlag.AlignJustify)
main_label.setOpenExternalLinks(True)
# Connection file
@@ -138,7 +138,7 @@ def __init__(self, parent=None):
# Ok and Cancel buttons
self.accept_btns = QDialogButtonBox(
QDialogButtonBox.Ok | QDialogButtonBox.Cancel,
- Qt.Horizontal, self)
+ Qt.Orientation.Horizontal, self)
self.accept_btns.accepted.connect(self.save_connection_settings)
self.accept_btns.accepted.connect(self.accept)
diff --git a/spyder/plugins/ipythonconsole/widgets/restartdialog.py b/spyder/plugins/ipythonconsole/widgets/restartdialog.py
index 2fbc140e63f..a0ae543dd18 100644
--- a/spyder/plugins/ipythonconsole/widgets/restartdialog.py
+++ b/spyder/plugins/ipythonconsole/widgets/restartdialog.py
@@ -71,7 +71,7 @@ def __init__(self, parent):
layout.addWidget(self._restart_current)
layout.addWidget(self._restart_all)
layout.addSpacing(10)
- layout.addWidget(self._action_button, 0, Qt.AlignRight)
+ layout.addWidget(self._action_button, 0, Qt.AlignmentFlag.AlignRight)
layout.setContentsMargins(20, 20, 20, 20)
self.setLayout(layout)
diff --git a/spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py b/spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py
index dea1641bb93..58168efe734 100644
--- a/spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py
+++ b/spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py
@@ -119,7 +119,7 @@ def test_connection_dialog_remembers_input_with_ssh_passphrase(
# Press ok and save connection settings
qtbot.mouseClick(dlg.accept_btns.button(QDialogButtonBox.Ok),
- Qt.LeftButton)
+ Qt.MouseButton.LeftButton)
# create new dialog and check fields
new_dlg = connection_dialog_factory.get_default_dialog()
@@ -146,7 +146,7 @@ def test_connection_dialog_doesnt_remember_input_with_ssh_passphrase(
# Press ok and save connection settings
qtbot.mouseClick(dlg.accept_btns.button(QDialogButtonBox.Ok),
- Qt.LeftButton)
+ Qt.MouseButton.LeftButton)
# create new dialog and check fields
new_dlg = connection_dialog_factory.get_default_dialog()
@@ -172,7 +172,7 @@ def test_connection_dialog_remembers_input_with_password(
# Press ok and save connection settings
qtbot.mouseClick(dlg.accept_btns.button(QDialogButtonBox.Ok),
- Qt.LeftButton)
+ Qt.MouseButton.LeftButton)
# create new dialog and check fields
new_dlg = connection_dialog_factory.get_default_dialog()
@@ -198,7 +198,7 @@ def test_connection_dialog_doesnt_remember_input_with_password(
# Press ok and save connection settings
qtbot.mouseClick(dlg.accept_btns.button(QDialogButtonBox.Ok),
- Qt.LeftButton)
+ Qt.MouseButton.LeftButton)
# create new dialog and check fields
new_dlg = connection_dialog_factory.get_default_dialog()
diff --git a/spyder/plugins/layout/api.py b/spyder/plugins/layout/api.py
index 80cfff117b7..ff36e334e05 100644
--- a/spyder/plugins/layout/api.py
+++ b/spyder/plugins/layout/api.py
@@ -400,7 +400,7 @@ def set_main_window_layout(self, main_window, dockable_plugins):
layout_data = []
# Find dock splits in the horizontal direction
- direction = Qt.Horizontal
+ direction = Qt.Orientation.Horizontal
for row in range(0, self._rows + 1):
dock = None
for col in range(0, self._cols + 1):
@@ -418,10 +418,10 @@ def set_main_window_layout(self, main_window, dockable_plugins):
dock = docks[key]
main_window.addDockWidget(
- Qt.LeftDockWidgetArea, dock, direction)
+ Qt.DockWidgetArea.LeftDockWidgetArea, dock, direction)
# Find dock splits in the vertical direction
- direction = Qt.Vertical
+ direction = Qt.Orientation.Vertical
for col in range(0, self._cols + 1):
dock = None
for row in range(0, self._rows + 1):
@@ -497,8 +497,8 @@ def set_main_window_layout(self, main_window, dockable_plugins):
row_stretches.append(stretch)
main_window.showMaximized()
- main_window.resizeDocks(column_docks, column_stretches, Qt.Horizontal)
- main_window.resizeDocks(row_docks, row_stretches, Qt.Vertical)
+ main_window.resizeDocks(column_docks, column_stretches, Qt.Orientation.Horizontal)
+ main_window.resizeDocks(row_docks, row_stretches, Qt.Orientation.Vertical)
# Restore displayed external plugins
for plugin_id in external_plugins_to_show:
diff --git a/spyder/plugins/layout/container.py b/spyder/plugins/layout/container.py
index 8f95ec66896..b2f4c0839c7 100644
--- a/spyder/plugins/layout/container.py
+++ b/spyder/plugins/layout/container.py
@@ -82,7 +82,7 @@ def setup(self):
text=_('Close current pane'),
icon=self.create_icon('close_pane'),
triggered=self._plugin.close_current_dockwidget,
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
register_shortcut=True,
shortcut_context='_'
)
@@ -93,7 +93,7 @@ def setup(self):
text=_('Maximize current pane'),
icon=self.create_icon('maximize'),
toggled=lambda state: self._plugin.maximize_dockwidget(),
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
register_shortcut=True,
shortcut_context='_')
@@ -102,7 +102,7 @@ def setup(self):
LayoutContainerActions.Fullscreen,
text=_('Fullscreen mode'),
triggered=self._plugin.toggle_fullscreen,
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
register_shortcut=True,
shortcut_context='_')
if sys.platform == 'darwin':
@@ -116,7 +116,7 @@ def setup(self):
text='',
triggered=lambda checked:
self._plugin.toggle_lock(),
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
register_shortcut=True,
shortcut_context='_'
)
@@ -125,14 +125,14 @@ def setup(self):
LayoutContainerActions.SaveLayoutAction,
_("Save current layout"),
triggered=self.show_save_layout,
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
register_shortcut=False,
)
self._show_preferences_action = self.create_action(
LayoutContainerActions.ShowLayoutPreferencesAction,
text=_("Layout preferences"),
triggered=self.show_layout_settings,
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
register_shortcut=False,
)
self._reset_action = self.create_action(
@@ -147,14 +147,14 @@ def setup(self):
LayoutContainerActions.NextLayout,
_("Use next layout"),
triggered=self.toggle_next_layout,
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
register_shortcut=True,
shortcut_context='_')
self._toggle_previous_layout_action = self.create_action(
LayoutContainerActions.PreviousLayout,
_("Use previous layout"),
triggered=self.toggle_previous_layout,
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
register_shortcut=True,
shortcut_context='_')
diff --git a/spyder/plugins/layout/plugin.py b/spyder/plugins/layout/plugin.py
index c3c8940fc5c..471c043be30 100644
--- a/spyder/plugins/layout/plugin.py
+++ b/spyder/plugins/layout/plugin.py
@@ -725,7 +725,7 @@ def maximize_dockwidget(self, restore=False):
# Automatically show the outline if the editor was maximized:
outline_explorer = self.get_plugin(Plugins.OutlineExplorer)
self.main.addDockWidget(
- Qt.RightDockWidgetArea,
+ Qt.DockWidgetArea.RightDockWidgetArea,
outline_explorer.dockwidget)
outline_explorer.dockwidget.show()
else:
diff --git a/spyder/plugins/layout/widgets/dialog.py b/spyder/plugins/layout/widgets/dialog.py
index 59b66eb835a..9ba16f071c9 100644
--- a/spyder/plugins/layout/widgets/dialog.py
+++ b/spyder/plugins/layout/widgets/dialog.py
@@ -58,16 +58,16 @@ def flags(self, index):
ui_name, name, state = self.row(row)
if name in self.read_only:
- return Qt.NoItemFlags
+ return Qt.ItemFlag.NoItemFlags
if not index.isValid():
- return Qt.ItemIsEnabled
+ return Qt.ItemFlag.ItemIsEnabled
column = index.column()
if column in [0]:
- return Qt.ItemFlags(int(Qt.ItemIsEnabled | Qt.ItemIsSelectable |
- Qt.ItemIsUserCheckable |
- Qt.ItemIsEditable))
+ return Qt.ItemFlags(int(Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable |
+ Qt.ItemFlag.ItemIsUserCheckable |
+ Qt.ItemFlag.ItemIsEditable))
else:
- return Qt.ItemFlags(Qt.ItemIsEnabled)
+ return Qt.ItemFlags(Qt.ItemFlag.ItemIsEnabled)
def data(self, index, role=Qt.DisplayRole):
"""Override Qt method"""
@@ -87,9 +87,9 @@ def data(self, index, role=Qt.DisplayRole):
elif role == Qt.CheckStateRole:
if column == 0:
if state:
- return Qt.Checked
+ return Qt.CheckState.Checked
else:
- return Qt.Unchecked
+ return Qt.CheckState.Unchecked
if column == 1:
return to_qvariant(state)
return to_qvariant()
@@ -147,7 +147,7 @@ def __init__(self, parent, order):
self.combo_box.clearEditText()
self.button_box = QDialogButtonBox(QDialogButtonBox.Ok |
QDialogButtonBox.Cancel,
- Qt.Horizontal, self)
+ Qt.Orientation.Horizontal, self)
self.button_ok = self.button_box.button(QDialogButtonBox.Ok)
self.button_cancel = self.button_box.button(QDialogButtonBox.Cancel)
@@ -197,7 +197,7 @@ def __init__(self, parent, names, ui_names, order, active, read_only):
self.button_delete = QPushButton(_('Delete Layout'))
self.button_box = QDialogButtonBox(QDialogButtonBox.Ok |
QDialogButtonBox.Cancel,
- Qt.Horizontal, self)
+ Qt.Orientation.Horizontal, self)
self.group_box = QGroupBox(_("Layout Display and Order"))
self.table = QTableView(self)
self.ok_button = self.button_box.button(QDialogButtonBox.Ok)
diff --git a/spyder/plugins/onlinehelp/widgets.py b/spyder/plugins/onlinehelp/widgets.py
index d97a9bb6241..ca00f3b0fb1 100644
--- a/spyder/plugins/onlinehelp/widgets.py
+++ b/spyder/plugins/onlinehelp/widgets.py
@@ -333,7 +333,7 @@ def initialize(self, checked=True, force=False):
server_needed = checked and self.server is None
if force or server_needed or not self.is_server_running():
self.sig_toggle_view_changed.disconnect(self.initialize)
- QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+ QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
self.start_server()
def is_server_running(self):
diff --git a/spyder/plugins/outlineexplorer/tests/test_widgets.py b/spyder/plugins/outlineexplorer/tests/test_widgets.py
index 54ab7d741d3..7dab6145831 100644
--- a/spyder/plugins/outlineexplorer/tests/test_widgets.py
+++ b/spyder/plugins/outlineexplorer/tests/test_widgets.py
@@ -136,7 +136,7 @@ def test_go_to_cursor_position(create_outlineexplorer, qtbot):
assert outlineexplorer.treewidget.currentItem() is None
qtbot.mouseClick(
outlineexplorer.get_toolbutton(OutlineExplorerToolbuttons.GoToCursor),
- Qt.LeftButton)
+ Qt.MouseButton.LeftButton)
assert outlineexplorer.treewidget.currentItem().text(0) == 'inner'
@@ -159,7 +159,7 @@ def test_follow_cursor(create_outlineexplorer, qtbot):
# Go to cursor to open the cursor
qtbot.mouseClick(
outlineexplorer.get_toolbutton(OutlineExplorerToolbuttons.GoToCursor),
- Qt.LeftButton)
+ Qt.MouseButton.LeftButton)
# Check if follows
editor._editor.go_to_line(1)
@@ -188,7 +188,7 @@ def test_go_to_cursor_position_with_new_file(create_outlineexplorer, qtbot):
filename = CASES['text']['file']
qtbot.mouseClick(
outlineexplorer.get_toolbutton(OutlineExplorerToolbuttons.GoToCursor),
- Qt.LeftButton)
+ Qt.MouseButton.LeftButton)
assert outlineexplorer.treewidget.currentItem().text(0) == filename
@@ -213,7 +213,7 @@ def test_go_to_last_item(create_outlineexplorer, qtbot):
# toolbar :
qtbot.mouseClick(
outlineexplorer.get_toolbutton(OutlineExplorerToolbuttons.GoToCursor),
- Qt.LeftButton)
+ Qt.MouseButton.LeftButton)
assert outlineexplorer.treewidget.currentItem().text(0) == 'method1'
diff --git a/spyder/plugins/plots/widgets/figurebrowser.py b/spyder/plugins/plots/widgets/figurebrowser.py
index 5fb06012f5e..cd3cd0a1585 100644
--- a/spyder/plugins/plots/widgets/figurebrowser.py
+++ b/spyder/plugins/plots/widgets/figurebrowser.py
@@ -329,7 +329,7 @@ def __init__(self, parent=None, background_color=None):
QScrollArea.__init__(self, parent)
SpyderWidgetMixin.__init__(self, class_parent=parent)
- self.setAlignment(Qt.AlignCenter)
+ self.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.viewport().setObjectName("figviewport")
self.viewport().setStyleSheet(
"#figviewport {background-color:" + str(background_color) + "}")
@@ -413,8 +413,8 @@ def eventFilter(self, widget, event):
# ---- Panning
# Set ClosedHandCursor:
elif event.type() == QEvent.MouseButtonPress:
- if event.button() == Qt.LeftButton:
- QApplication.setOverrideCursor(Qt.ClosedHandCursor)
+ if event.button() == Qt.MouseButton.LeftButton:
+ QApplication.setOverrideCursor(Qt.CursorShape.ClosedHandCursor)
self._ispanning = True
self.xclick = event.globalX()
self.yclick = event.globalY()
@@ -639,10 +639,10 @@ def eventFilter(self, widget, event):
"""
if event.type() == QEvent.KeyPress:
key = event.key()
- if key == Qt.Key_Up:
+ if key == Qt.Key.Key_Up:
self.go_previous_thumbnail()
return True
- elif key == Qt.Key_Down:
+ elif key == Qt.Key.Key_Down:
self.go_next_thumbnail()
return True
if event.type() == QEvent.Resize:
@@ -988,7 +988,7 @@ def setup_gui(self):
"""Setup the main layout of the widget."""
layout = QGridLayout(self)
layout.setContentsMargins(0, 0, 0, 0)
- layout.addWidget(self.canvas, 0, 0, Qt.AlignCenter)
+ layout.addWidget(self.canvas, 0, 0, Qt.AlignmentFlag.AlignCenter)
layout.setSizeConstraint(layout.SetFixedSize)
def highlight_canvas(self, highlight):
@@ -1028,7 +1028,7 @@ def eventFilter(self, widget, event):
clicked.
"""
if event.type() == QEvent.MouseButtonPress:
- if event.button() == Qt.LeftButton:
+ if event.button() == Qt.MouseButton.LeftButton:
self.sig_canvas_clicked.emit(self)
return super().eventFilter(widget, event)
diff --git a/spyder/plugins/plots/widgets/main_widget.py b/spyder/plugins/plots/widgets/main_widget.py
index 951019694f6..5b6126f5b85 100644
--- a/spyder/plugins/plots/widgets/main_widget.py
+++ b/spyder/plugins/plots/widgets/main_widget.py
@@ -73,7 +73,7 @@ def __init__(self, name=None, plugin=None, parent=None):
self._right_clicked_thumbnail = None
# Widget setup
- self.zoom_disp.setAlignment(Qt.AlignCenter)
+ self.zoom_disp.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.zoom_disp.setButtonSymbols(QSpinBox.NoButtons)
self.zoom_disp.setReadOnly(True)
self.zoom_disp.setSuffix(' %')
diff --git a/spyder/plugins/plots/widgets/tests/test_plots_widgets.py b/spyder/plugins/plots/widgets/tests/test_plots_widgets.py
index 1bda251e402..f5f410712b9 100644
--- a/spyder/plugins/plots/widgets/tests/test_plots_widgets.py
+++ b/spyder/plugins/plots/widgets/tests/test_plots_widgets.py
@@ -346,7 +346,7 @@ def test_mouse_clicking_thumbnails(figbrowser, tmpdir, qtbot, fmt):
figs = add_figures_to_browser(figbrowser, 3, tmpdir, fmt)
for i in [1, 0, 2]:
qtbot.mouseClick(
- figbrowser.thumbnails_sb._thumbnails[i].canvas, Qt.LeftButton)
+ figbrowser.thumbnails_sb._thumbnails[i].canvas, Qt.MouseButton.LeftButton)
assert figbrowser.thumbnails_sb.get_current_index() == i
assert figbrowser.thumbnails_sb.current_thumbnail.canvas.fig == figs[i]
assert figbrowser.figviewer.figcanvas.fig == figs[i]
diff --git a/spyder/plugins/preferences/api.py b/spyder/plugins/preferences/api.py
index 28a0aae3552..952fe0ce0a5 100644
--- a/spyder/plugins/preferences/api.py
+++ b/spyder/plugins/preferences/api.py
@@ -478,7 +478,7 @@ def show_message(is_checked):
return radiobutton
def create_lineedit(self, text, option, default=NoDefault,
- tip=None, alignment=Qt.Vertical, regex=None,
+ tip=None, alignment=Qt.Orientation.Vertical, regex=None,
restart=False, word_wrap=True, placeholder=None,
content_type=None, section=None):
if section is not None and section != self.CONF_SECTION:
@@ -487,7 +487,7 @@ def create_lineedit(self, text, option, default=NoDefault,
label.setWordWrap(word_wrap)
edit = QLineEdit()
edit.content_type = content_type
- layout = QVBoxLayout() if alignment == Qt.Vertical else QHBoxLayout()
+ layout = QVBoxLayout() if alignment == Qt.Orientation.Vertical else QHBoxLayout()
layout.addWidget(label)
layout.addWidget(edit)
layout.setContentsMargins(0, 0, 0, 0)
@@ -534,7 +534,7 @@ def create_textedit(self, text, option, default=NoDefault,
def create_browsedir(self, text, option, default=NoDefault, tip=None,
section=None):
widget = self.create_lineedit(text, option, default, section=section,
- alignment=Qt.Horizontal)
+ alignment=Qt.Orientation.Horizontal)
for edit in self.lineedits:
if widget.isAncestorOf(edit):
break
@@ -564,7 +564,7 @@ def select_directory(self, edit):
def create_browsefile(self, text, option, default=NoDefault, tip=None,
filters=None, section=None):
widget = self.create_lineedit(text, option, default, section=section,
- alignment=Qt.Horizontal)
+ alignment=Qt.Orientation.Horizontal)
for edit in self.lineedits:
if widget.isAncestorOf(edit):
break
@@ -641,7 +641,7 @@ def create_coloredit(self, text, option, default=NoDefault, tip=None,
if section is not None and section != self.CONF_SECTION:
self.cross_section_options[option] = section
label = QLabel(text)
- clayout = ColorLayout(QColor(Qt.black), self)
+ clayout = ColorLayout(QColor(Qt.GlobalColor.black), self)
clayout.lineedit.setMaximumWidth(80)
if tip is not None:
clayout.setToolTip(tip)
@@ -662,7 +662,7 @@ def create_scedit(self, text, option, default=NoDefault, tip=None,
if section is not None and section != self.CONF_SECTION:
self.cross_section_options[option] = section
label = QLabel(text)
- clayout = ColorLayout(QColor(Qt.black), self)
+ clayout = ColorLayout(QColor(Qt.GlobalColor.black), self)
clayout.lineedit.setMaximumWidth(80)
if tip is not None:
clayout.setToolTip(tip)
diff --git a/spyder/plugins/preferences/widgets/configdialog.py b/spyder/plugins/preferences/widgets/configdialog.py
index c2d8e2db660..211c9437b2e 100644
--- a/spyder/plugins/preferences/widgets/configdialog.py
+++ b/spyder/plugins/preferences/widgets/configdialog.py
@@ -161,7 +161,7 @@ def add_page(self, widget):
except TypeError:
pass
item.setText(widget.get_name())
- item.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
+ item.setFlags(Qt.ItemFlag.ItemIsSelectable|Qt.ItemFlag.ItemIsEnabled)
item.setSizeHint(QSize(0, 25))
def check_all_settings(self):
diff --git a/spyder/plugins/profiler/widgets/main_widget.py b/spyder/plugins/profiler/widgets/main_widget.py
index 21b5e26b0b9..d9949f631fc 100644
--- a/spyder/plugins/profiler/widgets/main_widget.py
+++ b/spyder/plugins/profiler/widgets/main_widget.py
@@ -898,31 +898,31 @@ def populate_tree(self, parentItem, children_list):
child_item.setToolTip(1, _('Time in function '
'(including sub-functions)'))
child_item.setData(1, Qt.DisplayRole, cum_time)
- child_item.setTextAlignment(1, Qt.AlignRight)
+ child_item.setTextAlignment(1, Qt.AlignmentFlag.AlignRight)
child_item.setData(2, Qt.DisplayRole, cum_time_dif[0])
child_item.setForeground(2, QColor(cum_time_dif[1]))
- child_item.setTextAlignment(2, Qt.AlignLeft)
+ child_item.setTextAlignment(2, Qt.AlignmentFlag.AlignLeft)
child_item.setToolTip(3, _('Local time in function '
'(not in sub-functions)'))
child_item.setData(3, Qt.DisplayRole, loc_time)
- child_item.setTextAlignment(3, Qt.AlignRight)
+ child_item.setTextAlignment(3, Qt.AlignmentFlag.AlignRight)
child_item.setData(4, Qt.DisplayRole, loc_time_dif[0])
child_item.setForeground(4, QColor(loc_time_dif[1]))
- child_item.setTextAlignment(4, Qt.AlignLeft)
+ child_item.setTextAlignment(4, Qt.AlignmentFlag.AlignLeft)
child_item.setToolTip(5, _('Total number of calls '
'(including recursion)'))
child_item.setData(5, Qt.DisplayRole, total_calls)
- child_item.setTextAlignment(5, Qt.AlignRight)
+ child_item.setTextAlignment(5, Qt.AlignmentFlag.AlignRight)
child_item.setData(6, Qt.DisplayRole, total_calls_dif[0])
child_item.setForeground(6, QColor(total_calls_dif[1]))
- child_item.setTextAlignment(6, Qt.AlignLeft)
+ child_item.setTextAlignment(6, Qt.AlignmentFlag.AlignLeft)
child_item.setToolTip(7, _('File:line '
'where function is defined'))
diff --git a/spyder/plugins/projects/widgets/main_widget.py b/spyder/plugins/projects/widgets/main_widget.py
index 074b525d5e4..60037e18b68 100644
--- a/spyder/plugins/projects/widgets/main_widget.py
+++ b/spyder/plugins/projects/widgets/main_widget.py
@@ -131,7 +131,7 @@ def __init__(self, directory=None):
hlayout1 = QHBoxLayout()
vlayout.addLayout(hlayout1)
label = QLabel("Open file:")
- label.setAlignment(Qt.AlignRight)
+ label.setAlignment(Qt.AlignmentFlag.AlignRight)
hlayout1.addWidget(label)
self.label1 = QLabel()
hlayout1.addWidget(self.label1)
@@ -140,7 +140,7 @@ def __init__(self, directory=None):
hlayout3 = QHBoxLayout()
vlayout.addLayout(hlayout3)
label = QLabel("Option changed:")
- label.setAlignment(Qt.AlignRight)
+ label.setAlignment(Qt.AlignmentFlag.AlignRight)
hlayout3.addWidget(label)
self.label3 = QLabel()
hlayout3.addWidget(self.label3)
diff --git a/spyder/plugins/projects/widgets/projectdialog.py b/spyder/plugins/projects/widgets/projectdialog.py
index 56d18b7b376..182f7b569ee 100644
--- a/spyder/plugins/projects/widgets/projectdialog.py
+++ b/spyder/plugins/projects/widgets/projectdialog.py
@@ -102,7 +102,7 @@ def __init__(self, parent, project_types):
self.button_cancel = QPushButton(_('Cancel'))
self.button_create = QPushButton(_('Create'))
- self.bbox = QDialogButtonBox(Qt.Horizontal)
+ self.bbox = QDialogButtonBox(Qt.Orientation.Horizontal)
self.bbox.addButton(self.button_cancel, QDialogButtonBox.ActionRole)
self.bbox.addButton(self.button_create, QDialogButtonBox.ActionRole)
diff --git a/spyder/plugins/pylint/plugin.py b/spyder/plugins/pylint/plugin.py
index d3e333a644d..eddca106e9f 100644
--- a/spyder/plugins/pylint/plugin.py
+++ b/spyder/plugins/pylint/plugin.py
@@ -83,7 +83,7 @@ def on_initialize(self):
tip=_("Run code analysis"),
icon=self.create_icon("pylint"),
triggered=self.start_code_analysis,
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
register_shortcut=True
)
pylint_act.setEnabled(is_module_installed("pylint"))
diff --git a/spyder/plugins/pythonpath/widgets/pathmanager.py b/spyder/plugins/pythonpath/widgets/pathmanager.py
index 3422d2963b4..786a52d488e 100644
--- a/spyder/plugins/pythonpath/widgets/pathmanager.py
+++ b/spyder/plugins/pythonpath/widgets/pathmanager.py
@@ -191,14 +191,14 @@ def _create_item(self, path):
item.setIcon(ima.icon('DirClosedIcon'))
if path in self.project_path:
- item.setFlags(Qt.NoItemFlags | Qt.ItemIsUserCheckable)
- item.setCheckState(Qt.Checked)
+ item.setFlags(Qt.ItemFlag.NoItemFlags | Qt.ItemFlag.ItemIsUserCheckable)
+ item.setCheckState(Qt.CheckState.Checked)
elif path in self.not_active_path:
- item.setFlags(item.flags() | Qt.ItemIsUserCheckable)
- item.setCheckState(Qt.Unchecked)
+ item.setFlags(item.flags() | Qt.ItemFlag.ItemIsUserCheckable)
+ item.setCheckState(Qt.CheckState.Unchecked)
else:
- item.setFlags(item.flags() | Qt.ItemIsUserCheckable)
- item.setCheckState(Qt.Checked)
+ item.setFlags(item.flags() | Qt.ItemFlag.ItemIsUserCheckable)
+ item.setCheckState(Qt.CheckState.Checked)
return item
@@ -207,8 +207,8 @@ def _create_header(self, text):
header = QListWidgetItem(text)
# Header is centered and it can't be selected
- header.setTextAlignment(Qt.AlignHCenter)
- header.setFlags(Qt.ItemIsEnabled)
+ header.setTextAlignment(Qt.AlignmentFlag.AlignHCenter)
+ header.setFlags(Qt.ItemFlag.ItemIsEnabled)
# Make header appear in bold
font = header.font()
@@ -342,7 +342,7 @@ def get_path_dict(self, project_path=False):
if item not in self.headers:
if path in self.project_path and not project_path:
continue
- odict[path] = item.checkState() == Qt.Checked
+ odict[path] = item.checkState() == Qt.CheckState.Checked
return odict
def get_user_path(self):
@@ -433,7 +433,7 @@ def add_path(self, directory=None):
if directory in self.get_path_dict():
item = self.listwidget.findItems(directory, Qt.MatchExactly)[0]
- item.setCheckState(Qt.Checked)
+ item.setCheckState(Qt.CheckState.Checked)
answer = QMessageBox.question(
self,
_("Add path"),
diff --git a/spyder/plugins/pythonpath/widgets/tests/test_pathmanager.py b/spyder/plugins/pythonpath/widgets/tests/test_pathmanager.py
index f6e73a0e384..17416ca65b8 100644
--- a/spyder/plugins/pythonpath/widgets/tests/test_pathmanager.py
+++ b/spyder/plugins/pythonpath/widgets/tests/test_pathmanager.py
@@ -57,7 +57,7 @@ def test_check_uncheck_path(pathmanager):
for row in range(1, pathmanager.listwidget.count()):
item = pathmanager.listwidget.item(row)
if item not in pathmanager.headers:
- assert item.checkState() == Qt.Checked
+ assert item.checkState() == Qt.CheckState.Checked
@pytest.mark.skipif(os.name != 'nt' or not is_module_installed('win32con'),
@@ -88,7 +88,7 @@ def test_export_to_PYTHONPATH(pathmanager, mocker):
# Uncheck 'path2' and assert that it is removed from PYTHONPATH when it
# is synchronized with Spyder's path list
- pathmanager.listwidget.item(6).setCheckState(Qt.Unchecked)
+ pathmanager.listwidget.item(6).setCheckState(Qt.CheckState.Unchecked)
pathmanager.export_pythonpath()
expected_pathlist = ['p1', 'p3']
env = get_user_env()
@@ -101,7 +101,7 @@ def test_export_to_PYTHONPATH(pathmanager, mocker):
# Uncheck 'path3' and assert that it is kept in PYTHONPATH when it
# is synchronized with Spyder's path list
- pathmanager.listwidget.item(6).setCheckState(Qt.Unchecked)
+ pathmanager.listwidget.item(6).setCheckState(Qt.CheckState.Unchecked)
pathmanager.export_pythonpath()
expected_pathlist = ['p3', 'p1']
env = get_user_env()
@@ -126,7 +126,7 @@ def test_invalid_directories(qtbot, pathmanager):
def interact_message_box():
child = pathmanager.findChild(QMessageBox)
- qtbot.keyPress(child, Qt.Key_Enter)
+ qtbot.keyPress(child, Qt.Key.Key_Enter)
for path in paths:
timer = QTimer()
@@ -150,14 +150,14 @@ def interact_message_box():
buttons = messagebox.findChildren(QPushButton)
for button in buttons:
if 'no' in button.text().lower():
- qtbot.mouseClick(button, Qt.LeftButton)
+ qtbot.mouseClick(button, Qt.MouseButton.LeftButton)
break
timer = QTimer()
timer.setSingleShot(True)
timer.timeout.connect(interact_message_box)
timer.start(100)
- qtbot.mouseClick(pathmanager.remove_button, Qt.LeftButton)
+ qtbot.mouseClick(pathmanager.remove_button, Qt.MouseButton.LeftButton)
# Back to main thread
assert pathmanager.count() == count
@@ -176,7 +176,7 @@ def interact_message_box():
buttons = messagebox.findChildren(QPushButton)
for button in buttons:
if 'yes' in button.text().lower():
- qtbot.mouseClick(button, Qt.LeftButton)
+ qtbot.mouseClick(button, Qt.MouseButton.LeftButton)
break
timer = QTimer()
@@ -184,7 +184,7 @@ def interact_message_box():
timer.timeout.connect(interact_message_box)
timer.start(100)
pathmanager.listwidget.setCurrentRow(4)
- qtbot.mouseClick(pathmanager.remove_button, Qt.LeftButton)
+ qtbot.mouseClick(pathmanager.remove_button, Qt.MouseButton.LeftButton)
# Back to main thread
assert pathmanager.count() == (count - 1)
@@ -206,7 +206,7 @@ def test_add_repeated_item(qtbot, pathmanager, tmpdir):
pathmanager.add_path(dir1)
pathmanager.add_path(dir2)
pathmanager.add_path(dir3)
- pathmanager.set_row_check_state(2, Qt.Unchecked)
+ pathmanager.set_row_check_state(2, Qt.CheckState.Unchecked)
assert not all(pathmanager.get_path_dict().values())
def interact_message_box():
@@ -214,7 +214,7 @@ def interact_message_box():
buttons = messagebox.findChildren(QPushButton)
for button in buttons:
if 'yes' in button.text().lower():
- qtbot.mouseClick(button, Qt.LeftButton)
+ qtbot.mouseClick(button, Qt.MouseButton.LeftButton)
break
timer = QTimer()
diff --git a/spyder/plugins/shortcuts/plugin.py b/spyder/plugins/shortcuts/plugin.py
index 155a09a0569..3abb63ba2a5 100644
--- a/spyder/plugins/shortcuts/plugin.py
+++ b/spyder/plugins/shortcuts/plugin.py
@@ -79,7 +79,7 @@ def on_initialize(self):
text=_("Shortcuts Summary"),
triggered=self.show_summary,
register_shortcut=True,
- context=Qt.ApplicationShortcut,
+ context=Qt.ShortcutContext.ApplicationShortcut,
)
@on_plugin_available(plugin=Plugins.Preferences)
diff --git a/spyder/plugins/shortcuts/tests/test_shortcuts.py b/spyder/plugins/shortcuts/tests/test_shortcuts.py
index 40a1203c49f..208f944144f 100644
--- a/spyder/plugins/shortcuts/tests/test_shortcuts.py
+++ b/spyder/plugins/shortcuts/tests/test_shortcuts.py
@@ -140,7 +140,7 @@ def test_clear_shortcut(create_shortcut_editor, qtbot):
shortcut is working as expected.
"""
shortcut_editor = create_shortcut_editor('editor', 'delete line')
- qtbot.mouseClick(shortcut_editor.button_clear, Qt.LeftButton)
+ qtbot.mouseClick(shortcut_editor.button_clear, Qt.MouseButton.LeftButton)
assert shortcut_editor.new_sequence == ''
@@ -151,7 +151,7 @@ def test_press_new_sequence(create_shortcut_editor, qtbot):
"""
shortcut_editor = create_shortcut_editor('editor', 'delete line')
modifiers = Qt.ControlModifier | Qt.ShiftModifier | Qt.AltModifier
- qtbot.keyClick(shortcut_editor, Qt.Key_D, modifier=modifiers)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_D, modifier=modifiers)
assert shortcut_editor.new_sequence == 'Ctrl+Alt+Shift+D'
assert shortcut_editor.warning == NO_WARNING
assert shortcut_editor.button_ok.isEnabled()
@@ -163,11 +163,11 @@ def test_press_new_compound_sequence(create_shortcut_editor, qtbot):
expected by the Shortcut Editor.
"""
shortcut_editor = create_shortcut_editor('editor', 'delete line')
- qtbot.keyClick(shortcut_editor, Qt.Key_D, modifier=Qt.ControlModifier)
- qtbot.keyClick(shortcut_editor, Qt.Key_A)
- qtbot.keyClick(shortcut_editor, Qt.Key_B, modifier=Qt.ControlModifier)
- qtbot.keyClick(shortcut_editor, Qt.Key_C)
- qtbot.keyClick(shortcut_editor, Qt.Key_D)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_D, modifier=Qt.ControlModifier)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_A)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_B, modifier=Qt.ControlModifier)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_C)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_D)
assert shortcut_editor.new_sequence == 'Ctrl+D, A, Ctrl+B, C'
# The 'D' key press event is discarted because a compound sequence
# cannot be composed of more than 4 sub sequences.
@@ -181,26 +181,26 @@ def test_clear_back_new_sequence(create_shortcut_editor, qtbot):
key sequence from the Shortcut Editor is working as expected.
"""
shortcut_editor = create_shortcut_editor('editor', 'delete line')
- qtbot.keyClick(shortcut_editor, Qt.Key_X, modifier=Qt.ControlModifier)
- qtbot.keyClick(shortcut_editor, Qt.Key_A)
- qtbot.keyClick(shortcut_editor, Qt.Key_B, modifier=Qt.ControlModifier)
- qtbot.keyClick(shortcut_editor, Qt.Key_C)
- qtbot.keyClick(shortcut_editor, Qt.Key_D)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_X, modifier=Qt.ControlModifier)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_A)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_B, modifier=Qt.ControlModifier)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_C)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_D)
# Remove last key sequence entered.
- qtbot.mouseClick(shortcut_editor.button_back_sequence, Qt.LeftButton)
+ qtbot.mouseClick(shortcut_editor.button_back_sequence, Qt.MouseButton.LeftButton)
assert shortcut_editor.new_sequence == 'Ctrl+X, A, Ctrl+B'
assert shortcut_editor.warning == SEQUENCE_CONFLICT
assert shortcut_editor.button_ok.isEnabled()
# Remove second to last key sequence entered.
- qtbot.mouseClick(shortcut_editor.button_back_sequence, Qt.LeftButton)
+ qtbot.mouseClick(shortcut_editor.button_back_sequence, Qt.MouseButton.LeftButton)
assert shortcut_editor.new_sequence == 'Ctrl+X, A'
assert shortcut_editor.warning == SEQUENCE_CONFLICT
assert shortcut_editor.button_ok.isEnabled()
# Clear all entered key sequences.
- qtbot.mouseClick(shortcut_editor.btn_clear_sequence, Qt.LeftButton)
+ qtbot.mouseClick(shortcut_editor.btn_clear_sequence, Qt.MouseButton.LeftButton)
assert shortcut_editor.new_sequence == ''
assert shortcut_editor.warning == SEQUENCE_EMPTY
assert not shortcut_editor.button_ok.isEnabled()
@@ -214,14 +214,14 @@ def test_sequence_conflict(create_shortcut_editor, qtbot):
shortcut_editor = create_shortcut_editor('editor', 'delete line')
# Check that the conflict is detected for a single key sequence.
- qtbot.keyClick(shortcut_editor, Qt.Key_X, modifier=Qt.ControlModifier)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_X, modifier=Qt.ControlModifier)
assert shortcut_editor.new_sequence == 'Ctrl+X'
assert shortcut_editor.warning == SEQUENCE_CONFLICT
assert shortcut_editor.button_ok.isEnabled()
# Check that the conflict is detected for a compound of key sequences.
- qtbot.keyClick(shortcut_editor, Qt.Key_X)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_X)
assert shortcut_editor.new_sequence == 'Ctrl+X, X'
assert shortcut_editor.warning == SEQUENCE_CONFLICT
assert shortcut_editor.button_ok.isEnabled()
@@ -236,20 +236,20 @@ def test_sequence_single_key(create_shortcut_editor, qtbot):
shortcut_editor = create_shortcut_editor('editor', 'delete line')
# Check this is working as expected for a single key sequence.
- qtbot.keyClick(shortcut_editor, Qt.Key_D)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_D)
assert shortcut_editor.new_sequence == 'D'
assert shortcut_editor.warning == INVALID_KEY
assert not shortcut_editor.button_ok.isEnabled()
# Check this is working as expected for a compound of key sequences.
- qtbot.keyClick(shortcut_editor, Qt.Key_D, modifier=Qt.ControlModifier)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_D, modifier=Qt.ControlModifier)
assert shortcut_editor.new_sequence == 'D, Ctrl+D'
assert shortcut_editor.warning == INVALID_KEY
assert not shortcut_editor.button_ok.isEnabled()
# Check this is working as expected when a valid single key is pressed.
- qtbot.mouseClick(shortcut_editor.btn_clear_sequence, Qt.LeftButton)
- qtbot.keyClick(shortcut_editor, Qt.Key_Home)
+ qtbot.mouseClick(shortcut_editor.btn_clear_sequence, Qt.MouseButton.LeftButton)
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_Home)
assert shortcut_editor.new_sequence == 'Home'
assert shortcut_editor.warning == NO_WARNING
assert shortcut_editor.button_ok.isEnabled()
@@ -264,7 +264,7 @@ def test_set_sequence_to_default(create_shortcut_editor, qtbot):
default_sequence = CONF.get(
'shortcuts', "{}/{}".format('editor', 'delete line'))
- qtbot.mouseClick(shortcut_editor.button_default, Qt.LeftButton)
+ qtbot.mouseClick(shortcut_editor.button_default, Qt.MouseButton.LeftButton)
assert shortcut_editor.new_sequence == default_sequence
assert shortcut_editor.warning == NO_WARNING
assert shortcut_editor.button_ok.isEnabled()
@@ -278,7 +278,7 @@ def test_invalid_char_in_sequence(create_shortcut_editor, qtbot):
shortcut_editor = create_shortcut_editor('editor', 'delete line')
# Check this is working as expected for a single key sequence.
- qtbot.keyClick(shortcut_editor, Qt.Key_Odiaeresis,
+ qtbot.keyClick(shortcut_editor, Qt.Key.Key_Odiaeresis,
modifier=Qt.ControlModifier | Qt.AltModifier)
assert shortcut_editor.warning == INVALID_KEY
assert not shortcut_editor.button_ok.isEnabled()
diff --git a/spyder/plugins/shortcuts/widgets/summary.py b/spyder/plugins/shortcuts/widgets/summary.py
index d1081d54c81..c6c351eef78 100644
--- a/spyder/plugins/shortcuts/widgets/summary.py
+++ b/spyder/plugins/shortcuts/widgets/summary.py
@@ -70,7 +70,7 @@ def __init__(self, parent=None):
font_title.setBold(True)
title_label = QLabel(self._shortcuts_summary_title)
- title_label.setAlignment(Qt.AlignCenter)
+ title_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
title_label.setFont(font_title)
# iter over shortcuts and create GroupBox for each context
diff --git a/spyder/plugins/shortcuts/widgets/table.py b/spyder/plugins/shortcuts/widgets/table.py
index 1f95d42778d..35df63cb06d 100644
--- a/spyder/plugins/shortcuts/widgets/table.py
+++ b/spyder/plugins/shortcuts/widgets/table.py
@@ -119,11 +119,11 @@ class ShortcutFinder(FinderLineEdit):
def keyPressEvent(self, event):
"""Qt and FilterLineEdit Override."""
key = event.key()
- if key in [Qt.Key_Up]:
+ if key in [Qt.Key.Key_Up]:
self._parent.previous_row()
- elif key in [Qt.Key_Down]:
+ elif key in [Qt.Key.Key_Down]:
self._parent.next_row()
- elif key in [Qt.Key_Enter, Qt.Key_Return]:
+ elif key in [Qt.Key.Key_Enter, Qt.Key.Key_Return]:
self._parent.show_editor()
else:
super(ShortcutFinder, self).keyPressEvent(event)
@@ -173,7 +173,7 @@ def setup(self):
_("Press the new shortcut and select 'Ok' to confirm, "
"click 'Cancel' to revert to the previous state, "
"or use 'Clear' to unbind the command from a shortcut."))
- self.label_info.setAlignment(Qt.AlignTop | Qt.AlignLeft)
+ self.label_info.setAlignment(Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignLeft)
self.label_info.setWordWrap(True)
layout_info = QHBoxLayout()
layout_info.setContentsMargins(0, 0, 0, 0)
@@ -192,7 +192,7 @@ def setup(self):
self.helper_button.setIcon(QIcon())
self.label_warning = QLabel()
self.label_warning.setWordWrap(True)
- self.label_warning.setAlignment(Qt.AlignTop | Qt.AlignLeft)
+ self.label_warning.setAlignment(Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignLeft)
self.button_default = QPushButton(_('Default'))
self.button_ok = QPushButton(_('Ok'))
@@ -270,14 +270,14 @@ def setup(self):
self.button_clear, self.button_default, self.button_cancel,
self.button_ok, self.btn_clear_sequence, self.button_back_sequence)
for w in widgets:
- w.setFocusPolicy(Qt.NoFocus)
+ w.setFocusPolicy(Qt.FocusPolicy.NoFocus)
w.clearFocus()
@Slot()
def reject(self):
"""Slot for rejected signal."""
# Added for spyder-ide/spyder#5426. Due to the focusPolicy of
- # Qt.NoFocus for the buttons, if the cancel button was clicked without
+ # Qt.FocusPolicy.NoFocus for the buttons, if the cancel button was clicked without
# first setting focus to the button, it would cause a seg fault crash.
self.button_cancel.setFocus()
super(ShortcutEditor, self).reject()
@@ -286,7 +286,7 @@ def reject(self):
def accept(self):
"""Slot for accepted signal."""
# Added for spyder-ide/spyder#5426. Due to the focusPolicy of
- # Qt.NoFocus for the buttons, if the cancel button was clicked without
+ # Qt.FocusPolicy.NoFocus for the buttons, if the cancel button was clicked without
# first setting focus to the button, it would cause a seg fault crash.
self.button_ok.setFocus()
super(ShortcutEditor, self).accept()
@@ -308,13 +308,13 @@ def event(self, event):
def keyPressEvent(self, event):
"""Qt method override."""
event_key = event.key()
- if not event_key or event_key == Qt.Key_unknown:
+ if not event_key or event_key == Qt.Key.Key_unknown:
return
if len(self._qsequences) == 4:
# QKeySequence accepts a maximum of 4 different sequences.
return
- if event_key in [Qt.Key_Control, Qt.Key_Shift,
- Qt.Key_Alt, Qt.Key_Meta]:
+ if event_key in [Qt.Key.Key_Control, Qt.Key.Key_Shift,
+ Qt.Key.Key_Alt, Qt.Key.Key_Meta]:
# The event corresponds to just and only a special key.
return
@@ -531,7 +531,7 @@ def sortByName(self):
def flags(self, index):
"""Qt Override."""
if not index.isValid():
- return Qt.ItemIsEnabled
+ return Qt.ItemFlag.ItemIsEnabled
return Qt.ItemFlags(int(QAbstractTableModel.flags(self, index)))
def data(self, index, role=Qt.DisplayRole):
@@ -572,18 +572,18 @@ def data(self, index, role=Qt.DisplayRole):
# hidden.
return to_qvariant(self.scores[row])
elif role == Qt.TextAlignmentRole:
- return to_qvariant(int(Qt.AlignHCenter | Qt.AlignVCenter))
+ return to_qvariant(int(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter))
return to_qvariant()
def headerData(self, section, orientation, role=Qt.DisplayRole):
"""Qt Override."""
if role == Qt.TextAlignmentRole:
- if orientation == Qt.Horizontal:
- return to_qvariant(int(Qt.AlignHCenter | Qt.AlignVCenter))
- return to_qvariant(int(Qt.AlignRight | Qt.AlignVCenter))
+ if orientation == Qt.Orientation.Horizontal:
+ return to_qvariant(int(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter))
+ return to_qvariant(int(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter))
if role != Qt.DisplayRole:
return to_qvariant()
- if orientation == Qt.Horizontal:
+ if orientation == Qt.Orientation.Horizontal:
if section == CONTEXT:
return to_qvariant(_("Context"))
elif section == NAME:
@@ -820,21 +820,21 @@ def previous_row(self):
def keyPressEvent(self, event):
"""Qt Override."""
key = event.key()
- if key in [Qt.Key_Enter, Qt.Key_Return]:
+ if key in [Qt.Key.Key_Enter, Qt.Key.Key_Return]:
self.show_editor()
- elif key in [Qt.Key_Tab]:
+ elif key in [Qt.Key.Key_Tab]:
self.finder.setFocus()
- elif key in [Qt.Key_Backtab]:
+ elif key in [Qt.Key.Key_Backtab]:
self.parent().reset_btn.setFocus()
- elif key in [Qt.Key_Up, Qt.Key_Down, Qt.Key_Left, Qt.Key_Right]:
+ elif key in [Qt.Key.Key_Up, Qt.Key.Key_Down, Qt.Key.Key_Left, Qt.Key.Key_Right]:
super(ShortcutsTable, self).keyPressEvent(event)
- elif key not in [Qt.Key_Escape, Qt.Key_Space]:
+ elif key not in [Qt.Key.Key_Escape, Qt.Key.Key_Space]:
text = event.text()
if text:
if re.search(VALID_FINDER_CHARS, text) is not None:
self.finder.setFocus()
self.finder.set_text(text)
- elif key in [Qt.Key_Escape]:
+ elif key in [Qt.Key.Key_Escape]:
self.finder.keyPressEvent(event)
def mouseDoubleClickEvent(self, event):
diff --git a/spyder/plugins/shortcuts/widgets/tests/test_summary.py b/spyder/plugins/shortcuts/widgets/tests/test_summary.py
index dbbaeb7d99f..ef204ada505 100644
--- a/spyder/plugins/shortcuts/widgets/tests/test_summary.py
+++ b/spyder/plugins/shortcuts/widgets/tests/test_summary.py
@@ -35,7 +35,7 @@ def test_shortcutssummary(dlg_shortcuts, qtbot):
assert not dlg_shortcuts._layout.isEmpty()
# Test that the dialog is closed properly on Esc keypress
- qtbot.keyClick(dlg_shortcuts, Qt.Key_Escape)
+ qtbot.keyClick(dlg_shortcuts, Qt.Key.Key_Escape)
assert not dlg_shortcuts.isVisible()
diff --git a/spyder/plugins/statusbar/widgets/tests/test_status.py b/spyder/plugins/statusbar/widgets/tests/test_status.py
index 57272f9b4ca..d92499c2807 100644
--- a/spyder/plugins/statusbar/widgets/tests/test_status.py
+++ b/spyder/plugins/statusbar/widgets/tests/test_status.py
@@ -79,7 +79,7 @@ def test_status_bar_widget_signal(status_bar, qtbot):
assert len(plugin.STATUS_WIDGETS) == 4
with qtbot.waitSignal(w.sig_clicked, timeout=1000):
- qtbot.mouseRelease(w, Qt.LeftButton)
+ qtbot.mouseRelease(w, Qt.MouseButton.LeftButton)
assert w.get_tooltip() == 'tooltip'
assert w.get_icon() == 'icon'
diff --git a/spyder/plugins/tours/widgets.py b/spyder/plugins/tours/widgets.py
index dfb82d6e898..217b0f54da3 100644
--- a/spyder/plugins/tours/widgets.py
+++ b/spyder/plugins/tours/widgets.py
@@ -176,7 +176,7 @@ def __init__(self, parent, opacity, duration, easing_curve, color,
self.setAttribute(Qt.WA_TranslucentBackground)
self.setAttribute(Qt.WA_TransparentForMouseEvents)
self.setModal(False)
- self.setFocusPolicy(Qt.NoFocus)
+ self.setFocusPolicy(Qt.FocusPolicy.NoFocus)
self.set_funcs_before_fade_in([self.update_canvas])
self.set_funcs_after_fade_out([lambda: self.update_widgets(None),
@@ -277,7 +277,7 @@ def paintEvent(self, event):
def reject(self):
"""Override Qt method"""
if not self.is_fade_running():
- key = Qt.Key_Escape
+ key = Qt.Key.Key_Escape
self.key_pressed = key
self.sig_key_pressed.emit()
@@ -345,7 +345,7 @@ def toolbutton(icon):
self.label_content.setMinimumWidth(self.fixed_width)
self.label_content.setMaximumWidth(self.fixed_width)
- self.label_current.setAlignment(Qt.AlignCenter)
+ self.label_current.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.label_content.setWordWrap(True)
@@ -382,9 +382,9 @@ def toolbutton(icon):
# Windows fix, slashes should be always in unix-style
self.stylesheet = self.stylesheet.replace('\\', '/')
- self.setFocusPolicy(Qt.StrongFocus)
+ self.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
for widget in self.widgets:
- widget.setFocusPolicy(Qt.NoFocus)
+ widget.setFocusPolicy(Qt.FocusPolicy.NoFocus)
widget.setStyleSheet(self.stylesheet)
layout_top = QHBoxLayout()
@@ -546,7 +546,7 @@ def paintEvent(self, event):
painter.fillPath(self.round_rect_path, self.color_back)
painter.fillPath(self.top_rect_path, self.color_top)
- painter.strokePath(self.round_rect_path, QPen(Qt.gray, 1))
+ painter.strokePath(self.round_rect_path, QPen(Qt.GlobalColor.gray, 1))
# TODO: Build the pointing arrow?
@@ -555,9 +555,9 @@ def keyReleaseEvent(self, event):
key = event.key()
self.key_pressed = key
- keys = [Qt.Key_Right, Qt.Key_Left, Qt.Key_Down, Qt.Key_Up,
- Qt.Key_Escape, Qt.Key_PageUp, Qt.Key_PageDown,
- Qt.Key_Home, Qt.Key_End, Qt.Key_Menu]
+ keys = [Qt.Key.Key_Right, Qt.Key.Key_Left, Qt.Key.Key_Down, Qt.Key.Key_Up,
+ Qt.Key.Key_Escape, Qt.Key.Key_PageUp, Qt.Key.Key_PageDown,
+ Qt.Key.Key_Home, Qt.Key.Key_End, Qt.Key.Key_Menu]
if key in keys:
if not self.is_fade_running():
@@ -569,7 +569,7 @@ def mousePressEvent(self, event):
self.parent.raise_()
self.raise_()
- if event.button() == Qt.RightButton:
+ if event.button() == Qt.MouseButton.RightButton:
pass
# clicked_widget = self.childAt(event.x(), event.y())
# if clicked_widget == self.label_current:
@@ -597,7 +597,7 @@ def context_menu_requested(self, event):
def reject(self):
"""Qt method to handle escape key event"""
if not self.is_fade_running():
- key = Qt.Key_Escape
+ key = Qt.Key.Key_Escape
self.key_pressed = key
self.sig_key_pressed.emit()
@@ -615,7 +615,7 @@ def __init__(self, parent):
self.duration_tips = [333, 333]
self.opacity_canvas = [0.0, 0.7]
self.opacity_tips = [0.0, 1.0]
- self.color = Qt.black
+ self.color = Qt.GlobalColor.black
self.easing_curve = [QEasingCurve.Linear]
self.current_step = 0
@@ -881,19 +881,19 @@ def _check_buttons(self):
def _key_pressed(self):
key = self.tips.key_pressed
- if ((key == Qt.Key_Right or key == Qt.Key_Down or
- key == Qt.Key_PageDown) and self.step_current != self.steps - 1):
+ if ((key == Qt.Key.Key_Right or key == Qt.Key.Key_Down or
+ key == Qt.Key.Key_PageDown) and self.step_current != self.steps - 1):
self.next_step()
- elif ((key == Qt.Key_Left or key == Qt.Key_Up or
- key == Qt.Key_PageUp) and self.step_current != 0):
+ elif ((key == Qt.Key.Key_Left or key == Qt.Key.Key_Up or
+ key == Qt.Key.Key_PageUp) and self.step_current != 0):
self.previous_step()
- elif key == Qt.Key_Escape:
+ elif key == Qt.Key.Key_Escape:
self.close_tour()
- elif key == Qt.Key_Home and self.step_current != 0:
+ elif key == Qt.Key.Key_Home and self.step_current != 0:
self.first_step()
- elif key == Qt.Key_End and self.step_current != self.steps - 1:
+ elif key == Qt.Key.Key_End and self.step_current != self.steps - 1:
self.last_step()
- elif key == Qt.Key_Menu:
+ elif key == Qt.Key.Key_Menu:
pos = self.tips.label_current.pos()
self.tips.context_menu_requested(pos)
diff --git a/spyder/plugins/variableexplorer/widgets/arrayeditor.py b/spyder/plugins/variableexplorer/widgets/arrayeditor.py
index 0aa4579d56f..06d5237a38a 100644
--- a/spyder/plugins/variableexplorer/widgets/arrayeditor.py
+++ b/spyder/plugins/variableexplorer/widgets/arrayeditor.py
@@ -294,7 +294,7 @@ def data(self, index, role=Qt.DisplayRole):
self.readonly = True
return repr(value)
elif role == Qt.TextAlignmentRole:
- return to_qvariant(int(Qt.AlignCenter|Qt.AlignVCenter))
+ return to_qvariant(int(Qt.AlignmentFlag.AlignCenter|Qt.AlignmentFlag.AlignVCenter))
elif (role == Qt.BackgroundColorRole and self.bgcolor_enabled
and value is not np.ma.masked and not self.has_inf):
try:
@@ -364,15 +364,15 @@ def setData(self, index, value, role=Qt.EditRole):
def flags(self, index):
"""Set editable flag"""
if not index.isValid():
- return Qt.ItemIsEnabled
+ return Qt.ItemFlag.ItemIsEnabled
return Qt.ItemFlags(int(QAbstractTableModel.flags(self, index) |
- Qt.ItemIsEditable))
+ Qt.ItemFlag.ItemIsEditable))
def headerData(self, section, orientation, role=Qt.DisplayRole):
"""Set header data"""
if role != Qt.DisplayRole:
return to_qvariant()
- labels = self.xlabels if orientation == Qt.Horizontal else self.ylabels
+ labels = self.xlabels if orientation == Qt.Orientation.Horizontal else self.ylabels
if labels is None:
return to_qvariant(int(section))
else:
@@ -403,7 +403,7 @@ def createEditor(self, parent, option, index):
elif value is not np.ma.masked:
editor = QLineEdit(parent)
editor.setFont(get_font(font_size_delta=DEFAULT_SMALL_DELTA))
- editor.setAlignment(Qt.AlignCenter)
+ editor.setAlignment(Qt.AlignmentFlag.AlignCenter)
if is_number(self.dtype):
validator = QDoubleValidator(editor)
validator.setLocale(QLocale('C'))
@@ -515,7 +515,7 @@ def load_more_data(self, value, rows=False, columns=False):
@Slot()
def resize_to_contents(self):
"""Resize cells to contents"""
- QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+ QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
self.resizeColumnsToContents()
self.model().fetch_more(columns=True)
self.resizeColumnsToContents()
@@ -527,7 +527,7 @@ def setup_menu(self):
shortcut=keybinding('Copy'),
icon=ima.icon('editcopy'),
triggered=self.copy,
- context=Qt.WidgetShortcut)
+ context=Qt.ShortcutContext.WidgetShortcut)
menu = QMenu(self)
add_actions(menu, [self.copy_action, ])
return menu
diff --git a/spyder/plugins/variableexplorer/widgets/collectionsdelegate.py b/spyder/plugins/variableexplorer/widgets/collectionsdelegate.py
index d46707cae0b..2ef8c78957d 100644
--- a/spyder/plugins/variableexplorer/widgets/collectionsdelegate.py
+++ b/spyder/plugins/variableexplorer/widgets/collectionsdelegate.py
@@ -253,7 +253,7 @@ def createEditor(self, parent, option, index, object_explorer=False):
else:
editor = QLineEdit(parent=parent)
editor.setFont(get_font(font_size_delta=DEFAULT_SMALL_DELTA))
- editor.setAlignment(Qt.AlignLeft)
+ editor.setAlignment(Qt.AlignmentFlag.AlignLeft)
# This is making Spyder crash because the QLineEdit that it's
# been modified is removed and a new one is created after
# evaluation. So the object on which this method is trying to
@@ -532,7 +532,7 @@ def createEditor(self, parent, option, index):
else:
editor = QLineEdit(parent=parent)
editor.setFont(get_font(font_size_delta=DEFAULT_SMALL_DELTA))
- editor.setAlignment(Qt.AlignLeft)
+ editor.setAlignment(Qt.AlignmentFlag.AlignLeft)
# This is making Spyder crash because the QLineEdit that it's
# been modified is removed and a new one is created after
# evaluation. So the object on which this method is trying to
diff --git a/spyder/plugins/variableexplorer/widgets/dataframeeditor.py b/spyder/plugins/variableexplorer/widgets/dataframeeditor.py
index 615de975c44..56562d7d748 100644
--- a/spyder/plugins/variableexplorer/widgets/dataframeeditor.py
+++ b/spyder/plugins/variableexplorer/widgets/dataframeeditor.py
@@ -81,7 +81,7 @@
BACKGROUND_NUMBER_SATURATION = 0.7
BACKGROUND_NUMBER_VALUE = 1.0
BACKGROUND_NUMBER_ALPHA = 0.6
-BACKGROUND_NONNUMBER_COLOR = Qt.lightGray
+BACKGROUND_NONNUMBER_COLOR = Qt.GlobalColor.lightGray
BACKGROUND_INDEX_ALPHA = 0.8
BACKGROUND_STRING_ALPHA = 0.05
BACKGROUND_MISC_ALPHA = 0.3
@@ -429,7 +429,7 @@ def sort(self, column, order=Qt.AscendingOrder):
def flags(self, index):
"""Set flags"""
return Qt.ItemFlags(int(QAbstractTableModel.flags(self, index) |
- Qt.ItemIsEditable))
+ Qt.ItemFlag.ItemIsEditable))
def setData(self, index, value, role=Qt.EditRole, change_type=None):
"""Cell content change"""
@@ -617,7 +617,7 @@ def setup_menu(self):
shortcut=keybinding('Copy'),
icon=ima.icon('editcopy'),
triggered=self.copy,
- context=Qt.WidgetShortcut)
+ context=Qt.ShortcutContext.WidgetShortcut)
functions = ((_("To bool"), bool), (_("To complex"), complex),
(_("To int"), int), (_("To float"), float),
(_("To str"), to_text_string))
@@ -627,7 +627,7 @@ def slot():
self.change_type(func)
types_in_menu += [create_action(self, name,
triggered=slot,
- context=Qt.WidgetShortcut)]
+ context=Qt.ShortcutContext.WidgetShortcut)]
menu = QMenu(self)
add_actions(menu, types_in_menu)
return menu
@@ -765,15 +765,15 @@ def sort(self, column, order=Qt.AscendingOrder):
def headerData(self, section, orientation, role):
"""Get the information to put in the header."""
if role == Qt.TextAlignmentRole:
- if orientation == Qt.Horizontal:
- return Qt.AlignCenter
+ if orientation == Qt.Orientation.Horizontal:
+ return Qt.AlignmentFlag.AlignCenter
else:
- return int(Qt.AlignRight | Qt.AlignVCenter)
+ return int(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter)
if role != Qt.DisplayRole and role != Qt.ToolTipRole:
return None
if self.axis == 1 and self._shape[1] <= 1:
return None
- orient_axis = 0 if orientation == Qt.Horizontal else 1
+ orient_axis = 0 if orientation == Qt.Orientation.Horizontal else 1
if self.model.header_shape[orient_axis] > 1:
header = section
else:
@@ -857,19 +857,19 @@ def headerData(self, section, orientation, role):
By default it returns 'Index i', where i is the section in the index
"""
if role == Qt.TextAlignmentRole:
- if orientation == Qt.Horizontal:
- return Qt.AlignCenter
+ if orientation == Qt.Orientation.Horizontal:
+ return Qt.AlignmentFlag.AlignCenter
else:
- return int(Qt.AlignRight | Qt.AlignVCenter)
+ return int(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter)
if role != Qt.DisplayRole and role != Qt.ToolTipRole:
return None
- if self.model.header_shape[0] <= 1 and orientation == Qt.Horizontal:
+ if self.model.header_shape[0] <= 1 and orientation == Qt.Orientation.Horizontal:
if self.model.name(1,section):
return self.model.name(1,section)
return _('Index')
elif self.model.header_shape[0] <= 1:
return None
- elif self.model.header_shape[1] <= 1 and orientation == Qt.Vertical:
+ elif self.model.header_shape[1] <= 1 and orientation == Qt.Orientation.Vertical:
return None
return _('Index') + ' ' + to_text_string(section)
@@ -941,8 +941,8 @@ def setup_and_check(self, data, title=''):
self.setWindowTitle(title)
- self.hscroll = QScrollBar(Qt.Horizontal)
- self.vscroll = QScrollBar(Qt.Vertical)
+ self.hscroll = QScrollBar(Qt.Orientation.Horizontal)
+ self.vscroll = QScrollBar(Qt.Orientation.Vertical)
# Create the view for the level
self.create_table_level()
@@ -1368,7 +1368,7 @@ def _fetch_more_rows(self):
@Slot()
def resize_to_contents(self):
- QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+ QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
self.dataTable.resizeColumnsToContents()
self.dataModel.fetch_more(columns=True)
self.dataTable.resizeColumnsToContents()
diff --git a/spyder/plugins/variableexplorer/widgets/importwizard.py b/spyder/plugins/variableexplorer/widgets/importwizard.py
index 7fa46403e02..3d104fd8221 100644
--- a/spyder/plugins/variableexplorer/widgets/importwizard.py
+++ b/spyder/plugins/variableexplorer/widgets/importwizard.py
@@ -291,7 +291,7 @@ def data(self, index, role=Qt.DisplayRole):
return to_qvariant(get_color(
self._data[index.row()][index.column()], 0.5))
elif role == Qt.TextAlignmentRole:
- return to_qvariant(int(Qt.AlignRight|Qt.AlignVCenter))
+ return to_qvariant(int(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignVCenter))
return to_qvariant()
def setData(self, index, value, role=Qt.EditRole):
diff --git a/spyder/plugins/variableexplorer/widgets/namespacebrowser.py b/spyder/plugins/variableexplorer/widgets/namespacebrowser.py
index e45eee5fd93..fe53a9e3069 100644
--- a/spyder/plugins/variableexplorer/widgets/namespacebrowser.py
+++ b/spyder/plugins/variableexplorer/widgets/namespacebrowser.py
@@ -218,7 +218,7 @@ def import_data(self, filenames=None):
except Exception as error:
error_message = str(error)
else:
- QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+ QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
QApplication.processEvents()
error_message = self.shellwidget.load_data(self.filename,
extension)
@@ -259,7 +259,7 @@ def save_data(self):
else:
return False
- QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+ QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
QApplication.processEvents()
error_message = self.shellwidget.save_namespace(self.filename)
@@ -305,15 +305,15 @@ def load_all_variables(self):
def keyPressEvent(self, event):
"""Qt and FilterLineEdit Override."""
key = event.key()
- if key in [Qt.Key_Up]:
+ if key in [Qt.Key.Key_Up]:
self.load_all_variables()
self._parent.previous_row()
- elif key in [Qt.Key_Down]:
+ elif key in [Qt.Key.Key_Down]:
self.load_all_variables()
self._parent.next_row()
- elif key in [Qt.Key_Escape]:
+ elif key in [Qt.Key.Key_Escape]:
self.main.sig_hide_finder_requested.emit()
- elif key in [Qt.Key_Enter, Qt.Key_Return]:
+ elif key in [Qt.Key.Key_Enter, Qt.Key.Key_Return]:
# TODO: Check if an editor needs to be shown
pass
else:
diff --git a/spyder/plugins/variableexplorer/widgets/objectexplorer/attribute_model.py b/spyder/plugins/variableexplorer/widgets/objectexplorer/attribute_model.py
index af27025d97e..1cece5c866e 100644
--- a/spyder/plugins/variableexplorer/widgets/objectexplorer/attribute_model.py
+++ b/spyder/plugins/variableexplorer/widgets/objectexplorer/attribute_model.py
@@ -42,8 +42,8 @@
# The cast to int is necessary to avoid a bug in PySide, See:
# https://bugreports.qt-project.org/browse/PYSIDE-20
-ALIGN_LEFT = int(Qt.AlignVCenter | Qt.AlignLeft)
-ALIGN_RIGHT = int(Qt.AlignVCenter | Qt.AlignRight)
+ALIGN_LEFT = int(Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignLeft)
+ALIGN_RIGHT = int(Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignRight)
logger = logging.getLogger(__name__)
diff --git a/spyder/plugins/variableexplorer/widgets/objectexplorer/objectexplorer.py b/spyder/plugins/variableexplorer/widgets/objectexplorer/objectexplorer.py
index 9ea20116b87..ca4e46b87c8 100644
--- a/spyder/plugins/variableexplorer/widgets/objectexplorer/objectexplorer.py
+++ b/spyder/plugins/variableexplorer/widgets/objectexplorer/objectexplorer.py
@@ -233,7 +233,7 @@ def _setup_views(self):
layout.setSpacing(0)
layout.addLayout(self.tools_layout)
- self.central_splitter = QSplitter(self, orientation=Qt.Vertical)
+ self.central_splitter = QSplitter(self, orientation=Qt.Orientation.Vertical)
layout.addWidget(self.central_splitter)
self.setLayout(layout)
diff --git a/spyder/plugins/variableexplorer/widgets/objectexplorer/tests/test_objectexplorer.py b/spyder/plugins/variableexplorer/widgets/objectexplorer/tests/test_objectexplorer.py
index 769b8d860a3..2b4b6fb8e09 100644
--- a/spyder/plugins/variableexplorer/widgets/objectexplorer/tests/test_objectexplorer.py
+++ b/spyder/plugins/variableexplorer/widgets/objectexplorer/tests/test_objectexplorer.py
@@ -65,37 +65,37 @@ def error_attribute(self):
header = editor.obj_tree.header()
header_model = header.model()
assert not header.isSectionHidden(0)
- assert header_model.headerData(0, Qt.Horizontal,
+ assert header_model.headerData(0, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Name"
assert not header.isSectionHidden(1)
- assert header_model.headerData(1, Qt.Horizontal,
+ assert header_model.headerData(1, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Type"
assert not header.isSectionHidden(2)
- assert header_model.headerData(2, Qt.Horizontal,
+ assert header_model.headerData(2, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Size"
assert not header.isSectionHidden(3)
- assert header_model.headerData(3, Qt.Horizontal,
+ assert header_model.headerData(3, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Value"
assert not header.isSectionHidden(4)
- assert header_model.headerData(4, Qt.Horizontal,
+ assert header_model.headerData(4, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Callable"
assert not header.isSectionHidden(5)
- assert header_model.headerData(5, Qt.Horizontal,
+ assert header_model.headerData(5, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Path"
assert header.isSectionHidden(6)
- assert header_model.headerData(6, Qt.Horizontal,
+ assert header_model.headerData(6, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Id"
assert header.isSectionHidden(7)
- assert header_model.headerData(7, Qt.Horizontal,
+ assert header_model.headerData(7, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Attribute"
assert header.isSectionHidden(8)
- assert header_model.headerData(8, Qt.Horizontal,
+ assert header_model.headerData(8, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Routine"
assert header.isSectionHidden(9)
- assert header_model.headerData(9, Qt.Horizontal,
+ assert header_model.headerData(9, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "File"
assert header.isSectionHidden(10)
- assert header_model.headerData(10, Qt.Horizontal,
+ assert header_model.headerData(10, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Source file"
model = editor.obj_tree.model()
diff --git a/spyder/plugins/variableexplorer/widgets/objectexplorer/toggle_column_mixin.py b/spyder/plugins/variableexplorer/widgets/objectexplorer/toggle_column_mixin.py
index c44d7c82354..68cbe1373b5 100644
--- a/spyder/plugins/variableexplorer/widgets/objectexplorer/toggle_column_mixin.py
+++ b/spyder/plugins/variableexplorer/widgets/objectexplorer/toggle_column_mixin.py
@@ -55,7 +55,7 @@ def add_header_context_menu(self, checked=None, checkable=None,
self.__toggle_functions = [] # for keeping references
for col in range(horizontal_header.count()):
- column_label = self.model().headerData(col, Qt.Horizontal,
+ column_label = self.model().headerData(col, Qt.Orientation.Horizontal,
Qt.DisplayRole)
logger.debug("Adding: col {}: {}".format(col, column_label))
action = QAction(str(column_label),
diff --git a/spyder/plugins/variableexplorer/widgets/objectexplorer/tree_model.py b/spyder/plugins/variableexplorer/widgets/objectexplorer/tree_model.py
index 54718738160..903a7a6a24b 100644
--- a/spyder/plugins/variableexplorer/widgets/objectexplorer/tree_model.py
+++ b/spyder/plugins/variableexplorer/widgets/objectexplorer/tree_model.py
@@ -174,12 +174,12 @@ def data(self, index, role):
def flags(self, index):
if not index.isValid():
- return Qt.NoItemFlags
+ return Qt.ItemFlag.NoItemFlags
- return Qt.ItemIsEnabled | Qt.ItemIsSelectable | Qt.ItemIsEditable
+ return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable | Qt.ItemFlag.ItemIsEditable
def headerData(self, section, orientation, role):
- if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+ if orientation == Qt.Orientation.Horizontal and role == Qt.DisplayRole:
return self._attr_cols[section].name
else:
return None
diff --git a/spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py b/spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py
index 943fdd197fc..552a1d3d9e4 100644
--- a/spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py
+++ b/spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py
@@ -109,7 +109,7 @@ def test_type_errors(setup_arrayeditor, qtbot):
Fixes spyder-ide/spyder#5254.
"""
dlg = setup_arrayeditor
- qtbot.keyClick(dlg.arraywidget.view, Qt.Key_Down, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(dlg.arraywidget.view, Qt.Key.Key_Down, modifier=Qt.ShiftModifier)
contents = dlg.arraywidget.model.get_value(dlg.arraywidget.model.index(0, 0))
assert_array_equal(contents, np.ones(10))
@@ -123,14 +123,14 @@ def test_type_errors(setup_arrayeditor, qtbot):
def test_arrayeditor_format(setup_arrayeditor, qtbot):
"""Changes the format of the array and validates its selected content."""
dlg = setup_arrayeditor
- qtbot.keyClick(dlg.arraywidget.view, Qt.Key_Down, modifier=Qt.ShiftModifier)
- qtbot.keyClick(dlg.arraywidget.view, Qt.Key_Down, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(dlg.arraywidget.view, Qt.Key.Key_Down, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(dlg.arraywidget.view, Qt.Key.Key_Down, modifier=Qt.ShiftModifier)
contents = dlg.arraywidget.view._sel_to_text(dlg.arraywidget.view.selectedIndexes())
assert contents == "1\n2\n"
dlg.arraywidget.view.model().set_format("%.18e")
assert dlg.arraywidget.view.model().get_format() == "%.18e"
- qtbot.keyClick(dlg.arraywidget.view, Qt.Key_Down, modifier=Qt.ShiftModifier)
- qtbot.keyClick(dlg.arraywidget.view, Qt.Key_Down, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(dlg.arraywidget.view, Qt.Key.Key_Down, modifier=Qt.ShiftModifier)
+ qtbot.keyClick(dlg.arraywidget.view, Qt.Key.Key_Down, modifier=Qt.ShiftModifier)
contents = dlg.arraywidget.view._sel_to_text(dlg.arraywidget.view.selectedIndexes())
assert contents == "1.000000000000000000e+00\n2.000000000000000000e+00\n"
@@ -225,13 +225,13 @@ def test_arrayeditor_edit_1d_array(qtbot):
dlg.show()
view = dlg.arraywidget.view
- qtbot.keyPress(view, Qt.Key_Down)
- qtbot.keyPress(view, Qt.Key_Up)
+ qtbot.keyPress(view, Qt.Key.Key_Down)
+ qtbot.keyPress(view, Qt.Key.Key_Up)
qtbot.keyClicks(view, '1')
- qtbot.keyPress(view, Qt.Key_Down)
+ qtbot.keyPress(view, Qt.Key.Key_Down)
qtbot.keyClicks(view, '0')
- qtbot.keyPress(view, Qt.Key_Down)
- qtbot.keyPress(view, Qt.Key_Return)
+ qtbot.keyPress(view, Qt.Key.Key_Down)
+ qtbot.keyPress(view, Qt.Key.Key_Return)
assert np.sum(exp_arr == dlg.get_value()) == 5
@@ -245,14 +245,14 @@ def test_arrayeditor_edit_2d_array(qtbot):
dlg.show()
view = dlg.arraywidget.view
- qtbot.keyPress(view, Qt.Key_Down)
- qtbot.keyPress(view, Qt.Key_Right)
+ qtbot.keyPress(view, Qt.Key.Key_Down)
+ qtbot.keyPress(view, Qt.Key.Key_Right)
qtbot.keyClicks(view, '3')
- qtbot.keyPress(view, Qt.Key_Down)
- qtbot.keyPress(view, Qt.Key_Right)
+ qtbot.keyPress(view, Qt.Key.Key_Down)
+ qtbot.keyPress(view, Qt.Key.Key_Right)
qtbot.keyClicks(view, '0')
- qtbot.keyPress(view, Qt.Key_Left)
- qtbot.keyPress(view, Qt.Key_Return)
+ qtbot.keyPress(view, Qt.Key.Key_Left)
+ qtbot.keyPress(view, Qt.Key.Key_Return)
assert np.sum(diff_arr != dlg.get_value()) == 2
@@ -270,7 +270,7 @@ def test_arrayeditor_edit_complex_array(qtbot):
with qtbot.waitExposed(dlg):
dlg.show()
view = dlg.arraywidget.view
- qtbot.keyPress(view, Qt.Key_Down)
+ qtbot.keyPress(view, Qt.Key.Key_Down)
# Prevent the test from failing
qtbot.wait(300)
@@ -278,7 +278,7 @@ def test_arrayeditor_edit_complex_array(qtbot):
# This is the actual editor widget on the cell
cell_editor = view.viewport().focusWidget()
qtbot.keyClicks(cell_editor, str(cnum))
- qtbot.keyPress(cell_editor, Qt.Key_Return)
+ qtbot.keyPress(cell_editor, Qt.Key.Key_Return)
dlg.accept()
@@ -338,19 +338,19 @@ def test_arrayeditor_edit_overflow(qtbot, monkeypatch):
dialog.show()
view = dialog.arraywidget.view
- qtbot.keyClick(view, Qt.Key_Down)
- qtbot.keyClick(view, Qt.Key_Up)
+ qtbot.keyClick(view, Qt.Key.Key_Down)
+ qtbot.keyClick(view, Qt.Key.Key_Up)
qtbot.keyClicks(view, '5')
- qtbot.keyClick(view, Qt.Key_Down)
- qtbot.keyClick(view, Qt.Key_Space)
+ qtbot.keyClick(view, Qt.Key.Key_Down)
+ qtbot.keyClick(view, Qt.Key.Key_Space)
qtbot.keyClicks(view.focusWidget(), str(int(2 ** bit_exponent)))
- qtbot.keyClick(view.focusWidget(), Qt.Key_Down)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Down)
MockQMessageBox.critical.assert_called_with(ANY, "Error", ANY)
assert MockQMessageBox.critical.call_count == idx
qtbot.keyClicks(view, '7')
- qtbot.keyClick(view, Qt.Key_Up)
+ qtbot.keyClick(view, Qt.Key.Key_Up)
qtbot.keyClicks(view, '6')
- qtbot.keyClick(view, Qt.Key_Down)
+ qtbot.keyClick(view, Qt.Key.Key_Down)
qtbot.wait(200)
dialog.accept()
qtbot.wait(500)
diff --git a/spyder/plugins/variableexplorer/widgets/tests/test_dataframeeditor.py b/spyder/plugins/variableexplorer/widgets/tests/test_dataframeeditor.py
index 4bc08156076..f5cc3d547e9 100644
--- a/spyder/plugins/variableexplorer/widgets/tests/test_dataframeeditor.py
+++ b/spyder/plugins/variableexplorer/widgets/tests/test_dataframeeditor.py
@@ -113,9 +113,9 @@ def test_dataframe_to_type(qtbot):
# Show context menu and select option `To bool`
view.menu.show()
- qtbot.keyPress(view.menu, Qt.Key_Down)
- qtbot.keyPress(view.menu, Qt.Key_Down)
- qtbot.keyPress(view.menu, Qt.Key_Return)
+ qtbot.keyPress(view.menu, Qt.Key.Key_Down)
+ qtbot.keyPress(view.menu, Qt.Key.Key_Down)
+ qtbot.keyPress(view.menu, Qt.Key.Key_Return)
# Check that changes where made from the editor
assert editor.btn_save_and_close.isEnabled()
@@ -139,11 +139,11 @@ def test_dataframe_simpleindex(qtbot):
editor = DataFrameEditor(None)
editor.setup_and_check(df)
header = editor.table_header.model()
- assert header.headerData(0, Qt.Horizontal,
+ assert header.headerData(0, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "0"
- assert header.headerData(1, Qt.Horizontal,
+ assert header.headerData(1, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "1"
- assert header.headerData(5, Qt.Horizontal,
+ assert header.headerData(5, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "5"
@@ -154,11 +154,11 @@ def test_dataframe_simpleindex_custom_columns():
editor = DataFrameEditor(None)
editor.setup_and_check(df)
header = editor.table_header.model()
- assert header.headerData(0, Qt.Horizontal,
+ assert header.headerData(0, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "a"
- assert header.headerData(1, Qt.Horizontal,
+ assert header.headerData(1, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "b"
- assert header.headerData(4, Qt.Horizontal,
+ assert header.headerData(4, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "e"
@@ -175,7 +175,7 @@ def test_dataframe_multiindex():
editor = DataFrameEditor(None)
editor.setup_and_check(df)
header = editor.table_header.model()
- assert header.headerData(0, Qt.Horizontal,
+ assert header.headerData(0, Qt.Orientation.Horizontal,
Qt.DisplayRole) == 0
assert data_header(header, 0, 0) == 'bar'
assert data_header(header, 1, 0) == 'one'
@@ -197,7 +197,7 @@ def test_header_bom():
editor = DataFrameEditor(None)
editor.setup_and_check(df)
header = editor.table_header.model()
- assert header.headerData(0, Qt.Horizontal,
+ assert header.headerData(0, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Date (MMM-YY)"
@@ -209,17 +209,17 @@ def test_header_encoding():
editor = DataFrameEditor(None)
editor.setup_and_check(df)
header = editor.table_header.model()
- assert header.headerData(0, Qt.Horizontal,
+ assert header.headerData(0, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "Unnamed: 0"
- assert "Unieke_Idcode" in header.headerData(1, Qt.Horizontal,
+ assert "Unieke_Idcode" in header.headerData(1, Qt.Orientation.Horizontal,
Qt.DisplayRole)
- assert header.headerData(2, Qt.Horizontal,
+ assert header.headerData(2, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "a"
- assert header.headerData(3, Qt.Horizontal,
+ assert header.headerData(3, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "b"
- assert header.headerData(4, Qt.Horizontal,
+ assert header.headerData(4, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "c"
- assert header.headerData(5, Qt.Horizontal,
+ assert header.headerData(5, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "d"
@@ -394,7 +394,7 @@ def test_dataframeeditor_with_various_indexes():
assert dfm.rowCount() == 20
assert dfm.columnCount() == 1
header = editor.table_header.model()
- assert header.headerData(0, Qt.Horizontal,
+ assert header.headerData(0, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "0"
if rng_name == "Index":
@@ -538,19 +538,19 @@ def test_dataframeeditor_edit_overflow(qtbot, monkeypatch):
dialog.show()
view = dialog.dataTable
- qtbot.keyClick(view, Qt.Key_Right)
+ qtbot.keyClick(view, Qt.Key.Key_Right)
qtbot.keyClicks(view, '5')
- qtbot.keyClick(view, Qt.Key_Down)
- qtbot.keyClick(view, Qt.Key_Space)
- qtbot.keyClick(view.focusWidget(), Qt.Key_Backspace)
+ qtbot.keyClick(view, Qt.Key.Key_Down)
+ qtbot.keyClick(view, Qt.Key.Key_Space)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Backspace)
qtbot.keyClicks(view.focusWidget(), str(int(2 ** bit_exponet)))
- qtbot.keyClick(view.focusWidget(), Qt.Key_Down)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Down)
MockQMessageBox.critical.assert_called_with(ANY, "Error", ANY)
assert MockQMessageBox.critical.call_count == idx
qtbot.keyClicks(view, '7')
- qtbot.keyClick(view, Qt.Key_Up)
+ qtbot.keyClick(view, Qt.Key.Key_Up)
qtbot.keyClicks(view, '6')
- qtbot.keyClick(view, Qt.Key_Down)
+ qtbot.keyClick(view, Qt.Key.Key_Down)
qtbot.wait(200)
dialog.accept()
qtbot.wait(500)
@@ -615,17 +615,17 @@ def test_dataframeeditor_edit_complex(qtbot, monkeypatch):
dialog.show()
view = dialog.dataTable
- qtbot.keyClick(view, Qt.Key_Right)
- qtbot.keyClick(view, Qt.Key_Down)
- qtbot.keyClick(view, Qt.Key_Space)
- qtbot.keyClick(view.focusWidget(), Qt.Key_Backspace)
+ qtbot.keyClick(view, Qt.Key.Key_Right)
+ qtbot.keyClick(view, Qt.Key.Key_Down)
+ qtbot.keyClick(view, Qt.Key.Key_Space)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Backspace)
qtbot.keyClicks(view.focusWidget(), "42")
- qtbot.keyClick(view.focusWidget(), Qt.Key_Down)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Down)
MockQMessageBox.critical.assert_called_with(ANY, "Error", ANY)
assert MockQMessageBox.critical.call_count == count * 2 - 1
- qtbot.keyClick(view, Qt.Key_Down)
+ qtbot.keyClick(view, Qt.Key.Key_Down)
qtbot.keyClick(view, '1')
- qtbot.keyClick(view.focusWidget(), Qt.Key_Down)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Down)
MockQMessageBox.critical.assert_called_with(
ANY, "Error", ("Editing dtype {0!s} not yet supported."
.format(type(test_df.iloc[1, 0]).__name__)))
@@ -688,12 +688,12 @@ def test_dataframeeditor_edit_bool(qtbot, monkeypatch):
dialog.show()
view = dialog.dataTable
- qtbot.keyClick(view, Qt.Key_Right)
+ qtbot.keyClick(view, Qt.Key.Key_Right)
for test_str in test_strs:
- qtbot.keyClick(view, Qt.Key_Space)
- qtbot.keyClick(view.focusWidget(), Qt.Key_Backspace)
+ qtbot.keyClick(view, Qt.Key.Key_Space)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Backspace)
qtbot.keyClicks(view.focusWidget(), test_str)
- qtbot.keyClick(view.focusWidget(), Qt.Key_Down)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Down)
assert not MockQMessageBox.critical.called
qtbot.wait(200)
dialog.accept()
@@ -721,7 +721,7 @@ def test_non_ascii_index():
header = editor.table_header.model()
dfm = editor.model()
- assert header.headerData(0, Qt.Horizontal,
+ assert header.headerData(0, Qt.Orientation.Horizontal,
Qt.DisplayRole) == "кодирование"
assert data_index(index, 0, 0) == 'пример'
assert data(dfm, 0, 0) == 'файла'
@@ -741,7 +741,7 @@ def test_no_convert_strings_to_unicode():
header = editor.table_header.model()
dfm = editor.model()
- assert header.headerData(0, Qt.Horizontal,
+ assert header.headerData(0, Qt.Orientation.Horizontal,
Qt.DisplayRole) != u"кодирование"
assert data_index(index, 0, 0) != u'пример'
assert data(dfm, 0, 0) != u'файла'
diff --git a/spyder/plugins/variableexplorer/widgets/tests/test_namespacebrowser.py b/spyder/plugins/variableexplorer/widgets/tests/test_namespacebrowser.py
index 7d761754026..b2a57be4662 100644
--- a/spyder/plugins/variableexplorer/widgets/tests/test_namespacebrowser.py
+++ b/spyder/plugins/variableexplorer/widgets/tests/test_namespacebrowser.py
@@ -95,7 +95,7 @@ def test_sort_by_column(namespacebrowser, qtbot):
with qtbot.waitSignal(header.sectionClicked):
browser.show()
- qtbot.mouseClick(header.viewport(), Qt.LeftButton, pos=QPoint(1, 1))
+ qtbot.mouseClick(header.viewport(), Qt.MouseButton.LeftButton, pos=QPoint(1, 1))
# Check sort effect
assert data_table(model, 2, 4) == [['b_variable', 'a_variable'],
@@ -145,7 +145,7 @@ def test_keys_sorted_and_sort_with_large_rows(namespacebrowser, qtbot):
# Sort
header = browser.editor.horizontalHeader()
with qtbot.waitSignal(header.sectionClicked):
- qtbot.mouseClick(header.viewport(), Qt.LeftButton, pos=QPoint(1, 1))
+ qtbot.mouseClick(header.viewport(), Qt.MouseButton.LeftButton, pos=QPoint(1, 1))
# Assert we loaded all data before performing the sort.
assert data(model, 0, 0) == 'i'
diff --git a/spyder/utils/qthelpers.py b/spyder/utils/qthelpers.py
index 70f81e03f54..ce09a391e45 100644
--- a/spyder/utils/qthelpers.py
+++ b/spyder/utils/qthelpers.py
@@ -246,7 +246,7 @@ def create_toolbutton(parent, text=None, shortcut=None, icon=None, tip=None,
if text is not None or tip is not None:
button.setToolTip(text if tip is None else tip)
if text_beside_icon:
- button.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+ button.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
button.setAutoRaise(autoraise)
if triggered is not None:
button.clicked.connect(triggered)
@@ -296,7 +296,7 @@ def action2button(action, autoraise=True, text_beside_icon=False, parent=None,
button.setDefaultAction(action)
button.setAutoRaise(autoraise)
if text_beside_icon:
- button.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+ button.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
if icon:
action.setIcon(icon)
return button
@@ -312,7 +312,7 @@ def toggle_actions(actions, enable):
def create_action(parent, text, shortcut=None, icon=None, tip=None,
toggled=None, triggered=None, data=None, menurole=None,
- context=Qt.WindowShortcut, option=None, section=None,
+ context=Qt.ShortcutContext.WindowShortcut, option=None, section=None,
id_=None, plugin=None, context_name=None,
register_action=False, overwrite=False):
"""Create a QAction"""
@@ -333,11 +333,11 @@ def create_action(parent, text, shortcut=None, icon=None, tip=None,
if menurole is not None:
action.setMenuRole(menurole)
- # Workround for Mac because setting context=Qt.WidgetShortcut
+ # Workround for Mac because setting context=Qt.ShortcutContext.WidgetShortcut
# there doesn't have any effect
if sys.platform == 'darwin':
action._shown_shortcut = None
- if context == Qt.WidgetShortcut:
+ if context == Qt.ShortcutContext.WidgetShortcut:
if shortcut is not None:
action._shown_shortcut = shortcut
else:
diff --git a/spyder/utils/syntaxhighlighters.py b/spyder/utils/syntaxhighlighters.py
index 40d2999eac0..f436f833dc8 100644
--- a/spyder/utils/syntaxhighlighters.py
+++ b/spyder/utils/syntaxhighlighters.py
@@ -383,7 +383,7 @@ def highlight_extras(self, text, offset=0):
self.highlight_patterns(text, offset=offset)
def rehighlight(self):
- QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+ QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
QSyntaxHighlighter.rehighlight(self)
QApplication.restoreOverrideCursor()
diff --git a/spyder/utils/test.py b/spyder/utils/test.py
index e21f186ffd1..12b05849e94 100644
--- a/spyder/utils/test.py
+++ b/spyder/utils/test.py
@@ -21,4 +21,4 @@ def close_message_box(qtbot):
top_level_widgets = QApplication.topLevelWidgets()
for w in top_level_widgets:
if isinstance(w, QMessageBox):
- qtbot.keyClick(w, Qt.Key_Enter)
+ qtbot.keyClick(w, Qt.Key.Key_Enter)
diff --git a/spyder/widgets/about.py b/spyder/widgets/about.py
index 82a3aed03e0..5c12e914293 100644
--- a/spyder/widgets/about.py
+++ b/spyder/widgets/about.py
@@ -168,7 +168,7 @@ def __init__(self, parent):
for label in [self.label_overview, self.label_community,
self.label_legal]:
label.setWordWrap(True)
- label.setAlignment(Qt.AlignTop)
+ label.setAlignment(Qt.AlignmentFlag.AlignTop)
label.setOpenExternalLinks(True)
label.setTextInteractionFlags(Qt.TextBrowserInteraction)
label.setContentsMargins(15, 0, 25, 0)
@@ -178,7 +178,7 @@ def __init__(self, parent):
self.label_pic = QLabel(self)
self.label_pic.setPixmap(
pixmap.scaledToWidth(100, Qt.SmoothTransformation))
- self.label_pic.setAlignment(Qt.AlignBottom)
+ self.label_pic.setAlignment(Qt.AlignmentFlag.AlignBottom)
self.info = QLabel((
"""
item_identation:
# When hovering over results
- self.setCursor(Qt.PointingHandCursor)
+ self.setCursor(Qt.CursorShape.PointingHandCursor)
else:
# On every other element
- self.setCursor(Qt.ArrowCursor)
+ self.setCursor(Qt.CursorShape.ArrowCursor)
diff --git a/spyder/widgets/reporterror.py b/spyder/widgets/reporterror.py
index 56870a4f7d1..9678979ea7e 100644
--- a/spyder/widgets/reporterror.py
+++ b/spyder/widgets/reporterror.py
@@ -83,14 +83,14 @@ def keyPressEvent(self, event):
if cursor_position < self.header_end_pos:
self.restrict_cursor_position(self.header_end_pos, 'eof')
- elif key == Qt.Key_Backspace:
+ elif key == Qt.Key.Key_Backspace:
if self.has_selected_text():
self.remove_text()
elif self.header_end_pos == cursor_position:
return
else:
self.stdkey_backspace()
- elif key == Qt.Key_X and ctrl:
+ elif key == Qt.Key.Key_X and ctrl:
self.cut()
else:
super().keyPressEvent(event)
@@ -159,7 +159,7 @@ def __init__(self, parent=None, is_report=False):
project_url=__project_url__))
self.main_label.setOpenExternalLinks(True)
self.main_label.setWordWrap(True)
- self.main_label.setAlignment(Qt.AlignJustify)
+ self.main_label.setAlignment(Qt.AlignmentFlag.AlignJustify)
self.main_label.setStyleSheet('font-size: 12px;')
# Issue title
@@ -184,7 +184,7 @@ def __init__(self, parent=None, is_report=False):
"clear way to reproduce them will be closed.")
)
self.steps_text.setWordWrap(True)
- self.steps_text.setAlignment(Qt.AlignJustify)
+ self.steps_text.setAlignment(Qt.AlignmentFlag.AlignJustify)
self.steps_text.setStyleSheet('font-size: 12px;')
# Field to input the description of the problem
diff --git a/spyder/widgets/simplecodeeditor.py b/spyder/widgets/simplecodeeditor.py
index 986b9c8cae7..ac93e8965ec 100644
--- a/spyder/widgets/simplecodeeditor.py
+++ b/spyder/widgets/simplecodeeditor.py
@@ -395,14 +395,14 @@ def linenumberarea_paint_event(self, event):
else:
font.setWeight(font.Normal)
painter.setFont(font)
- painter.setPen(QColor(Qt.darkGray))
+ painter.setPen(QColor(Qt.GlobalColor.darkGray))
right_padding = self.linenumberarea._right_padding
painter.drawText(
0,
top,
self.linenumberarea.width() - right_padding,
self.fontMetrics().height(),
- Qt.AlignRight, str(number),
+ Qt.AlignmentFlag.AlignRight, str(number),
)
block = block.next()
diff --git a/spyder/widgets/switcher.py b/spyder/widgets/switcher.py
index 72bcc002a0f..deeb9522367 100644
--- a/spyder/widgets/switcher.py
+++ b/spyder/widgets/switcher.py
@@ -64,13 +64,13 @@ class KeyPressFilter(QObject):
def eventFilter(self, src, e):
"""Override Qt eventFilter."""
if e.type() == QEvent.KeyPress:
- if e.key() == Qt.Key_Up:
+ if e.key() == Qt.Key.Key_Up:
self.sig_up_key_pressed.emit()
return True
- elif e.key() == Qt.Key_Down:
+ elif e.key() == Qt.Key.Key_Down:
self.sig_down_key_pressed.emit()
return True
- elif (e.key() == Qt.Key_Return):
+ elif (e.key() == Qt.Key.Key_Return):
self.sig_enter_key_pressed.emit()
return True
return super(KeyPressFilter, self).eventFilter(src, e)
@@ -79,7 +79,7 @@ def eventFilter(self, src, e):
class SwitcherDelegate(HTMLDelegate):
"""
This delegate allows the list view of the switcher to look like it has
- the focus, even when its focus policy is set to Qt.NoFocus.
+ the focus, even when its focus policy is set to Qt.FocusPolicy.NoFocus.
"""
def paint(self, painter, option, index):
@@ -194,7 +194,7 @@ def __init__(self, parent=None, styles=_STYLES):
"""Separator Item represented as
."""
super(SwitcherSeparatorItem, self).__init__(parent=parent,
styles=styles)
- self.setFlags(Qt.NoItemFlags)
+ self.setFlags(Qt.ItemFlag.NoItemFlags)
self._set_rendered_text()
# --- Helpers
@@ -305,7 +305,7 @@ def __init__(self, parent=None, icon=None, title=None, description=None,
self._section_visible = True
# Setup
- self.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
+ self.setFlags(Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable)
if icon:
self.setIcon(icon)
@@ -573,7 +573,7 @@ def __init__(self, parent, help_text=None, item_styles=ITEM_STYLES,
self.edit.setPlaceholderText(help_text if help_text else '')
self.list.setMinimumWidth(self._MIN_WIDTH)
self.list.setItemDelegate(SwitcherDelegate(self))
- self.list.setFocusPolicy(Qt.NoFocus)
+ self.list.setFocusPolicy(Qt.FocusPolicy.NoFocus)
self.list.setSelectionBehavior(self.list.SelectItems)
self.list.setSelectionMode(self.list.SingleSelection)
self.list.setVerticalScrollMode(QAbstractItemView.ScrollPerItem)
diff --git a/spyder/widgets/tabs.py b/spyder/widgets/tabs.py
index c64d2cde3f8..ffba5449b10 100644
--- a/spyder/widgets/tabs.py
+++ b/spyder/widgets/tabs.py
@@ -77,7 +77,7 @@ def eventFilter(self, widget, event):
if ((event.type() == QEvent.MouseButtonPress and
not self.geometry().contains(event.globalPos())) or
(event.type() == QEvent.KeyPress and
- event.key() == Qt.Key_Escape)):
+ event.key() == Qt.Key.Key_Escape)):
# Exits editing
self.hide()
return True
@@ -157,7 +157,7 @@ def __init__(self, parent, ancestor, rename_tabs=False, split_char='',
def mousePressEvent(self, event):
"""Reimplement Qt method"""
- if event.button() == Qt.LeftButton:
+ if event.button() == Qt.MouseButton.LeftButton:
self.__drag_start_pos = QPoint(event.pos())
QTabBar.mousePressEvent(self, event)
@@ -167,7 +167,7 @@ def mouseMoveEvent(self, event):
# between plugins, but righit now it's breaking the regular
# Qt drag behavior for tabs, so we're commenting it for
# now
- #if event.buttons() == Qt.MouseButtons(Qt.LeftButton) and \
+ #if event.buttons() == Qt.MouseButtons(Qt.MouseButton.LeftButton) and \
# (event.pos() - self.__drag_start_pos).manhattanLength() > \
# QApplication.startDragDistance():
# drag = QDrag(self)
@@ -224,7 +224,7 @@ def dropEvent(self, event):
def mouseDoubleClickEvent(self, event):
"""Override Qt method to trigger the tab name editor."""
if self.rename_tabs is True and \
- event.buttons() == Qt.MouseButtons(Qt.LeftButton):
+ event.buttons() == Qt.MouseButtons(Qt.MouseButton.LeftButton):
# Tab index
index = self.tabAt(event.pos())
if index >= 0:
@@ -389,13 +389,13 @@ def keyPressEvent(self, event):
handled = False
if ctrl and self.count() > 0:
index = self.currentIndex()
- if key == Qt.Key_PageUp:
+ if key == Qt.Key.Key_PageUp:
if index > 0:
self.setCurrentIndex(index - 1)
else:
self.setCurrentIndex(self.count() - 1)
handled = True
- elif key == Qt.Key_PageDown:
+ elif key == Qt.Key.Key_PageDown:
if index < self.count() - 1:
self.setCurrentIndex(index + 1)
else:
diff --git a/spyder/widgets/tests/test_array_builder.py b/spyder/widgets/tests/test_array_builder.py
index 49eea0658e7..4100271e30b 100644
--- a/spyder/widgets/tests/test_array_builder.py
+++ b/spyder/widgets/tests/test_array_builder.py
@@ -48,7 +48,7 @@ def botarray(qtbot):
def test_array_inline_array(botinline):
qtbot, dialog, widget = botinline
qtbot.keyClicks(widget, '1 2 3 4 5 6')
- qtbot.keyPress(widget, Qt.Key_Return)
+ qtbot.keyPress(widget, Qt.Key.Key_Return)
value = dialog.text()
assert value == 'np.array([[1, 2, 3],\n [4, 5, 6]])'
@@ -56,7 +56,7 @@ def test_array_inline_array(botinline):
def test_array_inline_matrix(botinline):
qtbot, dialog, widget = botinline
qtbot.keyClicks(widget, '4 5 6 7 8 9')
- qtbot.keyPress(widget, Qt.Key_Return, modifier=Qt.ControlModifier)
+ qtbot.keyPress(widget, Qt.Key.Key_Return, modifier=Qt.ControlModifier)
value = dialog.text()
assert value == 'np.matrix([[4, 5, 6],\n [7, 8, 9]])'
@@ -64,7 +64,7 @@ def test_array_inline_matrix(botinline):
def test_array_inline_array_invalid(botinline):
qtbot, dialog, widget = botinline
qtbot.keyClicks(widget, '1 2 3 4 5 6 7')
- qtbot.keyPress(widget, Qt.Key_Return)
+ qtbot.keyPress(widget, Qt.Key.Key_Return)
dialog.update_warning()
assert not dialog.is_valid()
@@ -72,7 +72,7 @@ def test_array_inline_array_invalid(botinline):
def test_array_inline_1d_array(botinline):
qtbot, dialog, widget = botinline
qtbot.keyClicks(widget, '4 5 6')
- qtbot.keyPress(widget, Qt.Key_Return, modifier=Qt.ControlModifier)
+ qtbot.keyPress(widget, Qt.Key.Key_Return, modifier=Qt.ControlModifier)
value = dialog.text()
assert value == 'np.matrix([4, 5, 6])'
@@ -80,7 +80,7 @@ def test_array_inline_1d_array(botinline):
def test_array_inline_nan_array(botinline):
qtbot, dialog, widget = botinline
qtbot.keyClicks(widget, '4 nan 6 8 9')
- qtbot.keyPress(widget, Qt.Key_Return, modifier=Qt.ControlModifier)
+ qtbot.keyPress(widget, Qt.Key.Key_Return, modifier=Qt.ControlModifier)
value = dialog.text()
assert value == 'np.matrix([4, np.nan, 6, 8, 9])'
@@ -88,7 +88,7 @@ def test_array_inline_nan_array(botinline):
def test_array_inline_inf_array(botinline):
qtbot, dialog, widget = botinline
qtbot.keyClicks(widget, '4 inf 6 8 9')
- qtbot.keyPress(widget, Qt.Key_Return, modifier=Qt.ControlModifier)
+ qtbot.keyPress(widget, Qt.Key.Key_Return, modifier=Qt.ControlModifier)
value = dialog.text()
assert value == 'np.matrix([4, np.inf, 6, 8, 9])'
@@ -96,7 +96,7 @@ def test_array_inline_inf_array(botinline):
def test_array_inline_force_float_array(botinlinefloat):
qtbot, dialog, widget = botinlinefloat
qtbot.keyClicks(widget, '4 5 6 8 9')
- qtbot.keyPress(widget, Qt.Key_Return, modifier=Qt.ControlModifier)
+ qtbot.keyPress(widget, Qt.Key.Key_Return, modifier=Qt.ControlModifier)
value = dialog.text()
assert value == 'np.matrix([4.0, 5.0, 6.0, 8.0, 9.0])'
@@ -104,65 +104,65 @@ def test_array_inline_force_float_array(botinlinefloat):
def test_array_inline_force_float_error_array(botinlinefloat):
qtbot, dialog, widget = botinlinefloat
qtbot.keyClicks(widget, '4 5 6 a 9')
- qtbot.keyPress(widget, Qt.Key_Return, modifier=Qt.ControlModifier)
+ qtbot.keyPress(widget, Qt.Key.Key_Return, modifier=Qt.ControlModifier)
value = dialog.text()
assert value == 'np.matrix([4.0, 5.0, 6.0, a, 9.0])'
def test_array_table_array(botarray):
qtbot, dialog, widget = botarray
- qtbot.keyClick(widget, Qt.Key_1)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_2)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_Backtab) # Hack: in the tests the selected cell is wrong
- qtbot.keyClick(widget, Qt.Key_3)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_4)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_5)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_6)
- qtbot.keyClick(widget, Qt.Key_Tab) # Hack: in the tests the selected cell is wrong
- qtbot.keyClick(widget, Qt.Key_Return, modifier=Qt.NoModifier)
+ qtbot.keyClick(widget, Qt.Key.Key_1)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_2)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_Backtab) # Hack: in the tests the selected cell is wrong
+ qtbot.keyClick(widget, Qt.Key.Key_3)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_4)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_5)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_6)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab) # Hack: in the tests the selected cell is wrong
+ qtbot.keyClick(widget, Qt.Key.Key_Return, modifier=Qt.KeyboardModifier.NoModifier)
value = dialog.text()
assert value == 'np.array([[1, 2, 3],\n [4, 5, 6]])'
def test_array_table_matrix(botarray): # analysis:ignore
qtbot, dialog, widget = botarray
- qtbot.keyClick(widget, Qt.Key_1)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_2)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_Backtab) # Hack: in the tests the selected cell is wrong
- qtbot.keyClick(widget, Qt.Key_3)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_4)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_5)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_6)
- qtbot.keyClick(widget, Qt.Key_Tab) # Hack: in the tests the selected cell is wrong
- qtbot.keyClick(widget, Qt.Key_Return, modifier=Qt.ControlModifier)
+ qtbot.keyClick(widget, Qt.Key.Key_1)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_2)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_Backtab) # Hack: in the tests the selected cell is wrong
+ qtbot.keyClick(widget, Qt.Key.Key_3)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_4)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_5)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_6)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab) # Hack: in the tests the selected cell is wrong
+ qtbot.keyClick(widget, Qt.Key.Key_Return, modifier=Qt.ControlModifier)
value = dialog.text()
assert value == 'np.matrix([[1, 2, 3],\n [4, 5, 6]])'
def test_array_table_array_empty_items(botarray): # analysis:ignore
qtbot, dialog, widget = botarray
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_2)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_Backtab) # Hack: in the tests the selected cell is wrong
- qtbot.keyClick(widget, Qt.Key_3)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_5)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_6)
- qtbot.keyClick(widget, Qt.Key_Tab) # Hack: in the tests the selected cell is wrong
- qtbot.keyClick(widget, Qt.Key_Return, modifier=Qt.NoModifier)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_2)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_Backtab) # Hack: in the tests the selected cell is wrong
+ qtbot.keyClick(widget, Qt.Key.Key_3)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_5)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_6)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab) # Hack: in the tests the selected cell is wrong
+ qtbot.keyClick(widget, Qt.Key.Key_Return, modifier=Qt.KeyboardModifier.NoModifier)
value = dialog.text()
assert value == 'np.array([[0, 2, 3],\n [0, 5, 6]])'
@@ -170,18 +170,18 @@ def test_array_table_array_empty_items(botarray): # analysis:ignore
def test_array_table_array_spaces_in_item(botarray): # analysis:ignore
qtbot, dialog, widget = botarray
qtbot.keyClicks(widget, ' ')
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_2)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_Backtab)
- qtbot.keyClick(widget, Qt.Key_3)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_5)
- qtbot.keyClick(widget, Qt.Key_Tab)
- qtbot.keyClick(widget, Qt.Key_6)
- qtbot.keyClick(widget, Qt.Key_Tab) # Hack: in the tests the selected cell is wrong
- qtbot.keyClick(widget, Qt.Key_Return, modifier=Qt.NoModifier)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_2)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_Backtab)
+ qtbot.keyClick(widget, Qt.Key.Key_3)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_5)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab)
+ qtbot.keyClick(widget, Qt.Key.Key_6)
+ qtbot.keyClick(widget, Qt.Key.Key_Tab) # Hack: in the tests the selected cell is wrong
+ qtbot.keyClick(widget, Qt.Key.Key_Return, modifier=Qt.KeyboardModifier.NoModifier)
value = dialog.text()
assert value == 'np.array([[0, 2, 3],\n [0, 5, 6]])'
@@ -189,6 +189,6 @@ def test_array_table_array_spaces_in_item(botarray): # analysis:ignore
@pytest.mark.skipif(sys.platform == 'darwin', reason="It fails on macOS")
def test_array_table_matrix_empty(botarray): # analysis:ignore
qtbot, dialog, widget = botarray
- qtbot.keyClick(widget, Qt.Key_Return, modifier=Qt.NoModifier)
+ qtbot.keyClick(widget, Qt.Key.Key_Return, modifier=Qt.KeyboardModifier.NoModifier)
value = dialog.text()
assert value == ''
diff --git a/spyder/widgets/tests/test_collectioneditor.py b/spyder/widgets/tests/test_collectioneditor.py
index 056191f48ec..73c2053a1b1 100644
--- a/spyder/widgets/tests/test_collectioneditor.py
+++ b/spyder/widgets/tests/test_collectioneditor.py
@@ -758,16 +758,16 @@ def test_edit_nonsettable_objects(qtbot, nonsettable_objects_data):
indicies = [view.source_model.get_index_from_key(key) for key in keys]
for _ in range(3):
- qtbot.keyClick(view, Qt.Key_Right)
+ qtbot.keyClick(view, Qt.Key.Key_Right)
last_row = -1
rows_to_test = [index.row() for index in indicies]
for row in rows_to_test:
for _ in range(row - last_row - 1):
- qtbot.keyClick(view, Qt.Key_Down)
- qtbot.keyClick(view, Qt.Key_Space)
- qtbot.keyClick(view.focusWidget(), Qt.Key_Backspace)
+ qtbot.keyClick(view, Qt.Key.Key_Down)
+ qtbot.keyClick(view, Qt.Key.Key_Space)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Backspace)
qtbot.keyClicks(view.focusWidget(), "2")
- qtbot.keyClick(view.focusWidget(), Qt.Key_Down)
+ qtbot.keyClick(view.focusWidget(), Qt.Key.Key_Down)
last_row = row
qtbot.wait(100)
@@ -834,7 +834,7 @@ def test_collectionseditor_when_clicking_on_header_and_large_rows(qtbot):
view = editor.widget.editor
header = view.horizontalHeader()
with qtbot.waitSignal(header.sectionClicked, timeout=200):
- qtbot.mouseClick(header.viewport(), Qt.LeftButton, pos=QPoint(1, 1))
+ qtbot.mouseClick(header.viewport(), Qt.MouseButton.LeftButton, pos=QPoint(1, 1))
# Assert data was sorted correctly.
assert data(view.model, 0, 0) == 9999
diff --git a/spyder/widgets/tests/test_findreplace.py b/spyder/widgets/tests/test_findreplace.py
index 9f93f703db7..86c426580ea 100644
--- a/spyder/widgets/tests/test_findreplace.py
+++ b/spyder/widgets/tests/test_findreplace.py
@@ -123,7 +123,7 @@ def test_messages_action(findreplace_editor, qtbot):
# Assert messages_action is not visible when there's no text
edit.selectAll()
- qtbot.keyClick(edit, Qt.Key_Delete)
+ qtbot.keyClick(edit, Qt.Key.Key_Delete)
assert not findreplace.messages_action.isVisible()
# Search with wrong regexp
@@ -160,7 +160,7 @@ def test_replace_text_button(findreplace_editor, qtbot):
assert findreplace.replace_text_button.isChecked()
# Hide with the close button and show find row only
- qtbot.mouseClick(findreplace.close_button, Qt.LeftButton)
+ qtbot.mouseClick(findreplace.close_button, Qt.MouseButton.LeftButton)
findreplace.show(hide_replace=True)
qtbot.wait(500)
assert not findreplace.replace_text_button.isChecked()
@@ -203,7 +203,7 @@ def test_update_matches(findreplace_editor, qtbot):
# Check we don't update matches when the widget is hidden
findreplace.hide()
qtbot.wait(500)
- qtbot.keyClick(editor, Qt.Key_Return)
+ qtbot.keyClick(editor, Qt.Key.Key_Return)
qtbot.keyClicks(editor, 'foo')
qtbot.wait(500)
assert findreplace.number_matches_text.text() == '3 matches'
diff --git a/spyder/widgets/tests/test_reporterror.py b/spyder/widgets/tests/test_reporterror.py
index 67647d410bc..4490fd39e95 100644
--- a/spyder/widgets/tests/test_reporterror.py
+++ b/spyder/widgets/tests/test_reporterror.py
@@ -69,17 +69,17 @@ def test_dialog(error_dialog, qtbot):
# Assert backspace works as expected
qtbot.keyClicks(dlg.input_description, desc_text)
- qtbot.keyPress(dlg.input_description, Qt.Key_Backspace)
+ qtbot.keyPress(dlg.input_description, Qt.Key.Key_Backspace)
assert not dlg.submit_btn.isEnabled()
dlg.input_description.selectAll()
- qtbot.keyPress(dlg.input_description, Qt.Key_Backspace)
+ qtbot.keyPress(dlg.input_description, Qt.Key.Key_Backspace)
assert dlg.input_description.toPlainText() == dlg.input_description.header
ini_pos = dlg.input_description.get_position('sof')
dlg.input_description.set_cursor_position(ini_pos)
dlg.input_description.set_cursor_position('eol')
- qtbot.keyPress(dlg.input_description, Qt.Key_Backspace)
+ qtbot.keyPress(dlg.input_description, Qt.Key.Key_Backspace)
assert dlg.input_description.toPlainText() == dlg.input_description.header
# Assert chars label works as expected
diff --git a/spyder/widgets/tests/test_switcher.py b/spyder/widgets/tests/test_switcher.py
index 55a014fd7d6..949ec1826d9 100644
--- a/spyder/widgets/tests/test_switcher.py
+++ b/spyder/widgets/tests/test_switcher.py
@@ -64,7 +64,7 @@ def test_switcher(dlg_switcher, qtbot):
assert dlg_switcher.isVisible()
# Test that the dialog is closed properly on Esc keypress
- qtbot.keyClick(dlg_switcher.edit, Qt.Key_Escape)
+ qtbot.keyClick(dlg_switcher.edit, Qt.Key.Key_Escape)
assert not dlg_switcher.isVisible()
diff --git a/spyder/widgets/waitingspinner.py b/spyder/widgets/waitingspinner.py
index 463c676a3a5..05be4c0a576 100644
--- a/spyder/widgets/waitingspinner.py
+++ b/spyder/widgets/waitingspinner.py
@@ -51,7 +51,7 @@ def __init__(self, parent, centerOnParent=True,
self._disableParentWhenSpinning = disableParentWhenSpinning
# WAS IN initialize()
- self._color = QColor(Qt.black)
+ self._color = QColor(Qt.GlobalColor.black)
self._roundness = 100.0
self._minimumTrailOpacity = 3.14159265358979323846
self._trailFadePercentage = 80.0
@@ -81,7 +81,7 @@ def paintEvent(self, QPaintEvent):
self.updatePosition()
painter = QPainter(self)
- painter.fillRect(self.rect(), Qt.transparent)
+ painter.fillRect(self.rect(), Qt.GlobalColor.transparent)
painter.setRenderHint(QPainter.Antialiasing, True)
if self._currentCounter >= self._numberOfLines:
@@ -199,7 +199,7 @@ def isSpinning(self):
def setRoundness(self, roundness):
self._roundness = max(0.0, min(100.0, roundness))
- def setColor(self, color=Qt.black):
+ def setColor(self, color=Qt.GlobalColor.black):
self._color = QColor(color)
def setRevolutionsPerSecond(self, revolutionsPerSecond):