Update super usage in the "qt" backend

pyface/ui/qt4/about_dialog.py

@@ -86,7 +86,7 @@ def destroy(self):
             signal, handler = self._connections_to_remove.pop()
             signal.disconnect(handler)
 
-        super(AboutDialog, self).destroy()
+        super().destroy()
 
     # ------------------------------------------------------------------------
     # Protected 'IDialog' interface.

pyface/ui/qt4/action/action_item.py

@@ -26,7 +26,7 @@
 
 class PyfaceWidgetAction(QtGui.QWidgetAction):
     def __init__(self, parent, action):
-        super(PyfaceWidgetAction, self).__init__(parent)
+        super().__init__(parent)
         self.action = action
 
     def createWidget(self, parent):

pyface/ui/qt4/action/menu_manager.py

@@ -75,7 +75,7 @@ def destroy(self):
             menu = self._menus.pop()
             menu.dispose()
 
-        super(MenuManager, self).destroy()
+        super().destroy()
 
     # ------------------------------------------------------------------------
     # 'ActionManagerItem' interface.
@@ -171,7 +171,7 @@ def clear(self):
 
         self.menu_items = []
 
-        super(_Menu, self).clear()
+        super().clear()
 
     def is_empty(self):
         """ Is the menu empty? """

pyface/ui/qt4/action/tool_bar_manager.py

@@ -66,7 +66,7 @@ def __init__(self, *args, **traits):
         """ Creates a new tool bar manager. """
 
         # Base class constructor.
-        super(ToolBarManager, self).__init__(*args, **traits)
+        super().__init__(*args, **traits)
 
         # An image cache to make sure that we only load each image used in the
         # tool bar exactly once.
@@ -121,7 +121,7 @@ def destroy(self):
             toolbar = self._toolbars.pop()
             toolbar.dispose()
 
-        super(ToolBarManager, self).destroy()
+        super().destroy()
 
     # ------------------------------------------------------------------------
     # Private interface.

pyface/ui/qt4/application_window.py

@@ -129,15 +129,15 @@ def _size_default(self):
     # ------------------------------------------------------------------------
 
     def _create(self):
-        super(ApplicationWindow, self)._create()
+        super()._create()
 
         contents = self._create_contents(self.control)
         self.control.setCentralWidget(contents)
 
         self._create_trim_widgets(self.control)
 
     def _create_control(self, parent):
-        control = super(ApplicationWindow, self)._create_control(parent)
+        control = super()._create_control(parent)
         control.setObjectName("ApplicationWindow")
 
         control.setAnimated(False)

pyface/ui/qt4/code_editor/code_widget.py

@@ -33,7 +33,7 @@ class CodeWidget(QtGui.QPlainTextEdit):
     def __init__(
         self, parent, should_highlight_current_line=True, font=None, lexer=None
     ):
-        super(CodeWidget, self).__init__(parent)
+        super().__init__(parent)
 
         self.highlighter = PygmentsHighlighter(self.document(), lexer)
         self.line_number_widget = LineNumberWidget(self)
@@ -387,7 +387,7 @@ def keyPressEvent_action(self, event):
 
     def keyPressEvent(self, event):
         if self.isReadOnly():
-            return super(CodeWidget, self).keyPressEvent(event)
+            return super().keyPressEvent(event)
 
         key_sequence = QtGui.QKeySequence(event.key() + int(event.modifiers()))
 
@@ -432,7 +432,7 @@ def keyPressEvent(self, event):
             event.accept()
             return self.block_unindent()
 
-        return super(CodeWidget, self).keyPressEvent(event)
+        return super().keyPressEvent(event)
 
     def resizeEvent(self, event):
         QtGui.QPlainTextEdit.resizeEvent(self, event)
@@ -558,7 +558,7 @@ class AdvancedCodeWidget(QtGui.QWidget):
     # ------------------------------------------------------------------------
 
     def __init__(self, parent, font=None, lexer=None):
-        super(AdvancedCodeWidget, self).__init__(parent)
+        super().__init__(parent)
 
         self.code = CodeWidget(self, font=font, lexer=lexer)
         self.find = FindWidget(self)
@@ -804,7 +804,7 @@ def keyPressEvent(self, event):
                 self.previous_find_widget = self.active_find_widget
                 self.active_find_widget = None
 
-        return super(AdvancedCodeWidget, self).keyPressEvent(event)
+        return super().keyPressEvent(event)
 
     # ------------------------------------------------------------------------
     # Private methods

pyface/ui/qt4/code_editor/find_widget.py

@@ -16,7 +16,7 @@
 
 class FindWidget(QtGui.QWidget):
     def __init__(self, parent):
-        super(FindWidget, self).__init__(parent)
+        super().__init__(parent)
         self.adv_code_widget = weakref.ref(parent)
 
         # QFontMetrics.width() is deprecated and Qt docs suggest using

pyface/ui/qt4/code_editor/gutters.py

@@ -39,7 +39,7 @@ class StatusGutterWidget(GutterWidget):
     """
 
     def __init__(self, *args, **kw):
-        super(StatusGutterWidget, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
 
         self.error_lines = []
         self.warn_lines = []

pyface/ui/qt4/code_editor/pygments_highlighter.py

@@ -138,7 +138,7 @@ class PygmentsHighlighter(QtGui.QSyntaxHighlighter):
     """ Syntax highlighter that uses Pygments for parsing. """
 
     def __init__(self, parent, lexer=None):
-        super(PygmentsHighlighter, self).__init__(parent)
+        super().__init__(parent)
 
         try:
             self._lexer = get_lexer_by_name(lexer)

pyface/ui/qt4/code_editor/replace_widget.py

@@ -18,6 +18,8 @@
 
 class ReplaceWidget(FindWidget):
     def __init__(self, parent):
+        # We explicitly call __init__ on the classes which FindWidget inherits from
+        # instead of calling FindWidget.__init__.
         super(FindWidget, self).__init__(parent)
         self.adv_code_widget = weakref.ref(parent)
 

pyface/ui/qt4/console/bracket_matcher.py

@@ -32,7 +32,7 @@ def __init__(self, text_edit):
             text edit widget.
         """
         assert isinstance(text_edit, (QtGui.QTextEdit, QtGui.QPlainTextEdit))
-        super(BracketMatcher, self).__init__()
+        super().__init__()
 
         # The format to apply to matching brackets.
         self.format = QtGui.QTextCharFormat()

pyface/ui/qt4/console/call_tip_widget.py

@@ -28,7 +28,7 @@ def __init__(self, text_edit):
             text edit widget.
         """
         assert isinstance(text_edit, (QtGui.QTextEdit, QtGui.QPlainTextEdit))
-        super(CallTipWidget, self).__init__(None, QtCore.Qt.ToolTip)
+        super().__init__(None, QtCore.Qt.ToolTip)
 
         self._hide_timer = QtCore.QBasicTimer()
         self._text_edit = text_edit
@@ -78,7 +78,7 @@ def eventFilter(self, obj, event):
             elif etype == QtCore.QEvent.Leave:
                 self._leave_event_hide()
 
-        return super(CallTipWidget, self).eventFilter(obj, event)
+        return super().eventFilter(obj, event)
 
     def timerEvent(self, event):
         """ Reimplemented to hide the widget when the hide timer fires.
@@ -94,13 +94,13 @@ def timerEvent(self, event):
     def enterEvent(self, event):
         """ Reimplemented to cancel the hide timer.
         """
-        super(CallTipWidget, self).enterEvent(event)
+        super().enterEvent(event)
         self._hide_timer.stop()
 
     def hideEvent(self, event):
         """ Reimplemented to disconnect signal handlers and event filter.
         """
-        super(CallTipWidget, self).hideEvent(event)
+        super().hideEvent(event)
         self._text_edit.cursorPositionChanged.disconnect(
             self._cursor_position_changed
         )
@@ -109,7 +109,7 @@ def hideEvent(self, event):
     def leaveEvent(self, event):
         """ Reimplemented to start the hide timer.
         """
-        super(CallTipWidget, self).leaveEvent(event)
+        super().leaveEvent(event)
         self._leave_event_hide()
 
     def paintEvent(self, event):
@@ -121,17 +121,17 @@ def paintEvent(self, event):
         painter.drawPrimitive(QtGui.QStyle.PE_PanelTipLabel, option)
         painter.end()
 
-        super(CallTipWidget, self).paintEvent(event)
+        super().paintEvent(event)
 
     def setFont(self, font):
         """ Reimplemented to allow use of this method as a slot.
         """
-        super(CallTipWidget, self).setFont(font)
+        super().setFont(font)
 
     def showEvent(self, event):
         """ Reimplemented to connect signal handlers and event filter.
         """
-        super(CallTipWidget, self).showEvent(event)
+        super().showEvent(event)
         self._text_edit.cursorPositionChanged.connect(
             self._cursor_position_changed
         )

pyface/ui/qt4/console/console_widget.py

@@ -134,7 +134,7 @@ def __init__(self, parent=None):
         parent : QWidget, optional [default None]
             The parent for this widget.
         """
-        super(ConsoleWidget, self).__init__(parent)
+        super().__init__(parent)
 
         # A list of connected Qt signals to be removed before destruction.
         # First item in the tuple is the Qt signal. The second item is the
@@ -310,7 +310,7 @@ def eventFilter(self, obj, event):
             QtGui.QApplication.sendEvent(obj, QtGui.QDragLeaveEvent())
             return True
 
-        return super(ConsoleWidget, self).eventFilter(obj, event)
+        return super().eventFilter(obj, event)
 
     def _remove_event_listeners(self):
         while self._connections_to_remove:

pyface/ui/qt4/console/history_console_widget.py

@@ -25,7 +25,7 @@ class HistoryConsoleWidget(ConsoleWidget):
     # ---------------------------------------------------------------------------
 
     def __init__(self, *args, **kw):
-        super(HistoryConsoleWidget, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
 
         # HistoryConsoleWidget protected variables.
         self._history = []
@@ -42,9 +42,7 @@ def execute(self, source=None, hidden=False, interactive=False):
         if not hidden:
             history = self.input_buffer if source is None else source
 
-        executed = super(HistoryConsoleWidget, self).execute(
-            source, hidden, interactive
-        )
+        executed = super().execute(source, hidden, interactive)
 
         if executed and not hidden:
             # Save the command unless it was an empty string or was identical

pyface/ui/qt4/dialog.py

@@ -157,7 +157,7 @@ def destroy(self):
             signal, handler = self._connections_to_remove.pop()
             signal.disconnect(handler)
 
-        super(Dialog, self).destroy()
+        super().destroy()
 
     # ------------------------------------------------------------------------
     # Protected 'IWidget' interface.

pyface/ui/qt4/directory_dialog.py

@@ -60,7 +60,7 @@ def close(self):
             self.path = ""
 
         # Let the window close as normal.
-        super(DirectoryDialog, self).close()
+        super().close()
 
     # ------------------------------------------------------------------------
     # Protected 'IWidget' interface.

pyface/ui/qt4/file_dialog.py

@@ -104,7 +104,7 @@ def close(self):
         )
 
         # Let the window close as normal.
-        super(FileDialog, self).close()
+        super().close()
 
     # ------------------------------------------------------------------------
     # Protected 'IWidget' interface.

pyface/ui/qt4/gui.py

@@ -142,7 +142,7 @@ class _FutureCall(QtCore.QObject):
     _pyface_event = QtCore.QEvent.Type(QtCore.QEvent.registerEventType())
 
     def __init__(self, ms, callable, *args, **kw):
-        super(_FutureCall, self).__init__()
+        super().__init__()
 
         # Save the arguments.
         self._ms = ms
@@ -184,7 +184,7 @@ def event(self, event):
                 QtCore.QTimer.singleShot(self._ms, self._dispatch)
             return True
 
-        return super(_FutureCall, self).event(event)
+        return super().event(event)
 
     def _dispatch(self):
         """ Invoke the callable.

pyface/ui/qt4/heading_text.py

@@ -42,7 +42,7 @@ def __init__(self, parent, **traits):
         """ Creates the panel. """
 
         # Base class constructor.
-        super(HeadingText, self).__init__(**traits)
+        super().__init__(**traits)
 
         # Create the toolkit-specific control that represents the widget.
         self._create_control(parent)

pyface/ui/qt4/progress_dialog.py

@@ -96,15 +96,15 @@ class ProgressDialog(MProgressDialog, Window):
 
     def open(self):
         """ Opens the window. """
-        super(ProgressDialog, self).open()
+        super().open()
         self._start_time = time.time()
 
     def close(self):
         """ Closes the window. """
         self.progress_bar.destroy()
         self.progress_bar = None
 
-        super(ProgressDialog, self).close()
+        super().close()
 
     # -------------------------------------------------------------------------
     # 'IWidget' interface.
@@ -115,7 +115,7 @@ def destroy(self):
             signal, handler = self._connections_to_remove.pop()
             signal.disconnect(handler)
 
-        super(ProgressDialog, self).destroy()
+        super().destroy()
 
     # -------------------------------------------------------------------------
     # IProgressDialog Interface
@@ -273,7 +273,7 @@ def _create_control(self, parent):
         return QtGui.QDialog(parent)
 
     def _create(self):
-        super(ProgressDialog, self)._create()
+        super()._create()
         self._create_contents(self.control)
 
     def _create_contents(self, parent):

pyface/ui/qt4/python_editor.py

@@ -47,7 +47,7 @@ class PythonEditor(MPythonEditor, Widget):
     # ------------------------------------------------------------------------
 
     def __init__(self, parent, **traits):
-        super(PythonEditor, self).__init__(parent=parent, **traits)
+        super().__init__(parent=parent, **traits)
         self._create()
 
     # ------------------------------------------------------------------------
@@ -96,7 +96,7 @@ def select_line(self, lineno):
     # ------------------------------------------------------------------------
 
     def _add_event_listeners(self):
-        super(PythonEditor, self)._add_event_listeners()
+        super()._add_event_listeners()
         self.control.code.installEventFilter(self._event_filter)
 
         # Connect signals for text changes.
@@ -116,7 +116,7 @@ def _remove_event_listeners(self):
             if self._event_filter is not None:
                 self.control.code.removeEventFilter(self._event_filter)
 
-        super(PythonEditor, self)._remove_event_listeners()
+        super()._remove_event_listeners()
 
     def __event_filter_default(self):
         return PythonEditorEventFilter(self, self.control)
@@ -168,7 +168,7 @@ class PythonEditorEventFilter(QtCore.QObject):
     """
 
     def __init__(self, editor, parent):
-        super(PythonEditorEventFilter, self).__init__(parent)
+        super().__init__(parent)
         self.__editor = editor
 
     def eventFilter(self, obj, event):
@@ -211,4 +211,4 @@ def eventFilter(self, obj, event):
                 event=event,
             )
 
-        return super(PythonEditorEventFilter, self).eventFilter(obj, event)
+        return super().eventFilter(obj, event)