diff --git a/python/console/console_editor.py b/python/console/console_editor.py index 7e06d80c18a..51b799cadad 100644 --- a/python/console/console_editor.py +++ b/python/console/console_editor.py @@ -650,7 +650,7 @@ class Editor(QsciScintilla): return True def keyPressEvent(self, e): - if self.settings.value("pythonConsole/autoCloseBracketEditor", True, type=bool): + if self.settings.value("pythonConsole/autoCloseBracketEditor", False, type=bool): startLine, _, endLine, endPos = self.getSelection() t = unicode(e.text()) ## Close bracket automatically @@ -674,7 +674,7 @@ class Editor(QsciScintilla): self.insert(self.closing[i]) ## FIXES #8392 (automatically removes the redundant char ## when autoclosing brackets option is enabled) - if t in self.closing: + if t in [')', ']', '}']: l, pos = self.getCursorPosition() txt = self.text(l) try: diff --git a/python/console/console_sci.py b/python/console/console_sci.py index a8df2049191..080625f85b1 100644 --- a/python/console/console_sci.py +++ b/python/console/console_sci.py @@ -410,7 +410,7 @@ class ShellScintilla(QsciScintilla, code.InteractiveInterpreter): self.showNext() ## TODO: press event for auto-completion file directory else: - if self.settings.value("pythonConsole/autoCloseBracket", True, type=bool): + if self.settings.value("pythonConsole/autoCloseBracket", False, type=bool): t = unicode(e.text()) ## Close bracket automatically if t in self.opening: @@ -425,7 +425,7 @@ class ShellScintilla(QsciScintilla, code.InteractiveInterpreter): self.insert(self.closing[i]) ## FIXES #8392 (automatically removes the redundant char ## when autoclosing brackets option is enabled) - if t in self.closing: + if t in [')', ']', '}']: l, pos = self.getCursorPosition() txt = self.text(l) try: diff --git a/python/console/console_settings.py b/python/console/console_settings.py index 31350cf7818..e058a2ccdca 100644 --- a/python/console/console_settings.py +++ b/python/console/console_settings.py @@ -201,8 +201,8 @@ class optionsDialog(QDialog, Ui_SettingsDialogPythonConsole): self.autoCompThresholdEditor.setValue(settings.value("pythonConsole/autoCompThresholdEditor", 2, type=int)) self.enableObjectInspector.setChecked(settings.value("pythonConsole/enableObjectInsp", False, type=bool)) - self.autoCloseBracketEditor.setChecked(settings.value("pythonConsole/autoCloseBracketEditor", True, type=bool)) - self.autoCloseBracket.setChecked(settings.value("pythonConsole/autoCloseBracket", True, type=bool)) + self.autoCloseBracketEditor.setChecked(settings.value("pythonConsole/autoCloseBracketEditor", False, type=bool)) + self.autoCloseBracket.setChecked(settings.value("pythonConsole/autoCloseBracket", False, type=bool)) if settings.value("pythonConsole/autoCompleteSource") == 'fromDoc': self.autoCompFromDoc.setChecked(True)