diff -r 385f60c94548 -r 7c09585bd960 eric6/QScintilla/Editor.py --- a/eric6/QScintilla/Editor.py Sat Apr 10 18:31:17 2021 +0200 +++ b/eric6/QScintilla/Editor.py Sat Apr 10 18:38:27 2021 +0200 @@ -193,7 +193,7 @@ @type QWidget @exception OSError raised to indicate an issue accessing the file """ - super(Editor, self).__init__(parent) + super().__init__(parent) self.setAttribute(Qt.WidgetAttribute.WA_KeyCompression) self.setUtf8(True) @@ -5315,7 +5315,7 @@ if bool(self.__ctHookFunctions): self.__callTip() else: - super(Editor, self).callTip() + super().callTip() def __callTip(self): """ @@ -5365,7 +5365,7 @@ if len(callTips) == 0: if Preferences.getEditor("CallTipsScintillaOnFail"): # try QScintilla calltips - super(Editor, self).callTip() + super().callTip() return ctshift = 0 @@ -6968,7 +6968,7 @@ """ Public method to undo the last recorded change. """ - super(Editor, self).undo() + super().undo() self.undoAvailable.emit(self.isUndoAvailable()) self.redoAvailable.emit(self.isRedoAvailable()) @@ -6976,7 +6976,7 @@ """ Public method to redo the last recorded change. """ - super(Editor, self).redo() + super().redo() self.undoAvailable.emit(self.isUndoAvailable()) self.redoAvailable.emit(self.isRedoAvailable()) @@ -7031,7 +7031,7 @@ if self.fileName: self.taskViewer.clearFileTasks(self.fileName, True) - super(Editor, self).close() + super().close() def keyPressEvent(self, ev): """ @@ -7072,7 +7072,7 @@ ev.accept() return - super(Editor, self).keyPressEvent(ev) + super().keyPressEvent(ev) else: ev.ignore() @@ -7133,7 +7133,7 @@ self.setCursorFlashTime(QApplication.cursorFlashTime()) - super(Editor, self).focusInEvent(event) + super().focusInEvent(event) def focusOutEvent(self, event): """ @@ -7145,7 +7145,7 @@ self.vm.editorActGrp.setEnabled(False) self.setCaretWidth(0) - super(Editor, self).focusOutEvent(event) + super().focusOutEvent(event) def changeEvent(self, evt): """ @@ -7175,7 +7175,7 @@ cap = self.tr("{0} (ro)").format(cap) self.setWindowTitle(cap) - super(Editor, self).changeEvent(evt) + super().changeEvent(evt) def mousePressEvent(self, event): """ @@ -7185,7 +7185,7 @@ @type QMouseEvent """ self.vm.eventFilter(self, event) - super(Editor, self).mousePressEvent(event) + super().mousePressEvent(event) def mouseDoubleClickEvent(self, evt): """ @@ -7194,7 +7194,7 @@ @param evt reference to the mouse event @type QMouseEvent """ - super(Editor, self).mouseDoubleClickEvent(evt) + super().mouseDoubleClickEvent(evt) self.mouseDoubleClick.emit(evt.pos(), evt.buttons()) @@ -7222,7 +7222,7 @@ evt.accept() return - super(Editor, self).wheelEvent(evt) + super().wheelEvent(evt) def event(self, evt): """ @@ -7237,7 +7237,7 @@ self.gestureEvent(evt) return True - return super(Editor, self).event(evt) + return super().event(evt) def gestureEvent(self, evt): """ @@ -7269,7 +7269,7 @@ @param evt reference to the resize event @type QResizeEvent """ - super(Editor, self).resizeEvent(evt) + super().resizeEvent(evt) self.__markerMap.calculateGeometry() def viewportEvent(self, evt): @@ -7287,7 +7287,7 @@ # ignore this - there seems to be a runtime issue when the editor # is created pass - return super(Editor, self).viewportEvent(evt) + return super().viewportEvent(evt) def __updateReadOnly(self, bForce=True): """ @@ -7397,7 +7397,7 @@ Public method to set the styles according the selected Qt style or the selected editor colours. """ - super(Editor, self).clearStyles() + super().clearStyles() if Preferences.getEditor("OverrideEditAreaColours"): self.setColor(Preferences.getEditorColour("EditAreaForeground")) self.setPaper(Preferences.getEditorColour("EditAreaBackground")) @@ -7416,7 +7416,7 @@ if self.inDragDrop: event.acceptProposedAction() else: - super(Editor, self).dragEnterEvent(event) + super().dragEnterEvent(event) def dragMoveEvent(self, event): """ @@ -7427,7 +7427,7 @@ if self.inDragDrop: event.accept() else: - super(Editor, self).dragMoveEvent(event) + super().dragMoveEvent(event) def dragLeaveEvent(self, event): """ @@ -7439,7 +7439,7 @@ self.inDragDrop = False event.accept() else: - super(Editor, self).dragLeaveEvent(event) + super().dragLeaveEvent(event) def dropEvent(self, event): """ @@ -7461,7 +7461,7 @@ .format(fname)) event.acceptProposedAction() else: - super(Editor, self).dropEvent(event) + super().dropEvent(event) self.inDragDrop = False @@ -7734,7 +7734,7 @@ if text in matchingPairs: self.delete() - super(Editor, self).editorCommand(cmd) + super().editorCommand(cmd) def __applyTemplate(self, templateName, language): """ @@ -8471,7 +8471,7 @@ key = (int(modifiers), int(button)) self.vm.eventFilter(self, evt) - super(Editor, self).mouseReleaseEvent(evt) + super().mouseReleaseEvent(evt) if ( button != Qt.MouseButton.NoButton and