From ffa87a7b98e2778eb9c797eb8ecd777113d6ec77 Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Wed, 21 Apr 2021 09:49:54 +0530 Subject: [PATCH] CLN : Update super usage This commit updates super usage using automated regex-based search and replace. After the changes were made, we reviewed each of the changes to ensure that we were calling the right class before. --- enable/abstract_overlay.py | 4 ++-- enable/base_tool.py | 2 +- enable/canvas.py | 2 +- enable/component.py | 4 ++-- enable/component_editor.py | 2 +- enable/constraints_container.py | 2 +- enable/container.py | 6 +++--- enable/drawing/drawing_canvas.py | 8 ++++---- enable/examples/demo/enable/container_demo.py | 4 ++-- enable/examples/demo/savage/buttons_on_canvas.py | 4 ++-- enable/examples/demo/savage/static_image.py | 2 +- enable/graphics_context.py | 8 +++----- enable/layout/constraints_namespace.py | 4 ++-- enable/layout/layout_helpers.py | 12 ++++++------ enable/null/quartz.py | 4 +--- enable/primitives/image.py | 2 +- enable/qt4/base_window.py | 14 +++++++------- enable/qt4/gl.py | 2 +- enable/qt4/scrollbar.py | 10 +++++----- enable/savage/compliance/comparator.py | 4 ++-- enable/savage/compliance/crosshair.py | 2 +- enable/savage/compliance/drawer.py | 6 ++---- enable/savage/compliance/sike.py | 4 +--- enable/savage/compliance/viewer.py | 4 ++-- enable/savage/svg/css/identifier.py | 2 +- enable/savage/svg/pathdata.py | 2 +- enable/savage/trait_defs/ui/svg_button.py | 2 +- enable/savage/trait_defs/ui/svg_button_editor.py | 2 +- .../savage/trait_defs/ui/wx/kiva_render_panel.py | 2 +- .../savage/trait_defs/ui/wx/svg_button_editor.py | 2 +- enable/savage/trait_defs/ui/wx/wx_render_panel.py | 2 +- enable/scrolled.py | 2 +- enable/tests/test_event_transform.py | 6 +++--- enable/text_field.py | 2 +- enable/text_field_grid.py | 2 +- enable/tools/pyface/commands.py | 10 +++++----- enable/tools/pyface/move_command_tool.py | 2 +- enable/tools/pyface/resize_command_tool.py | 4 ++-- enable/tools/resize_tool.py | 2 +- enable/tools/toolbars/viewport_toolbar.py | 2 +- enable/tools/viewport_zoom_tool.py | 2 +- enable/trait_defs/ui/wx/rgba_color_editor.py | 2 +- enable/viewable.py | 2 +- enable/viewport.py | 6 +++--- enable/wx/gl.py | 4 ++-- enable/wx/quartz.py | 6 ++---- enable/wx/scrollbar.py | 8 ++++---- kiva/basecore2d.py | 2 +- kiva/blend2d.py | 2 +- kiva/cairo.py | 2 +- kiva/celiagg.py | 2 +- kiva/gl/__init__.py | 4 ++-- kiva/graphics_state.py | 2 +- kiva/pdf.py | 4 ++-- kiva/ps.py | 2 +- kiva/qpainter.py | 2 +- kiva/svg.py | 2 +- 57 files changed, 103 insertions(+), 113 deletions(-) diff --git a/enable/abstract_overlay.py b/enable/abstract_overlay.py index 26daae7ed..a6b79bb34 100644 --- a/enable/abstract_overlay.py +++ b/enable/abstract_overlay.py @@ -62,7 +62,7 @@ def _do_layout(self, component=None): def __init__(self, component=None, **kw): if component is not None: kw["component"] = component - super(AbstractOverlay, self).__init__(**kw) + super().__init__(**kw) def do_layout(self, size=None, force=False, component=None): """ Tells this component to do a layout at a given size. This differs @@ -94,4 +94,4 @@ def _request_redraw(self): """ if self.component is not None: self.component.request_redraw() - super(AbstractOverlay, self)._request_redraw() + super()._request_redraw() diff --git a/enable/base_tool.py b/enable/base_tool.py index f26125a2e..f6149abe5 100644 --- a/enable/base_tool.py +++ b/enable/base_tool.py @@ -127,7 +127,7 @@ class BaseTool(Interactor): def __init__(self, component=None, **traits): if component is not None: traits["component"] = component - super(BaseTool, self).__init__(**traits) + super().__init__(**traits) def dispatch(self, event, suffix): """ Dispatches a mouse event based on the current event state. diff --git a/enable/canvas.py b/enable/canvas.py index 4dee2666a..df071ffad 100644 --- a/enable/canvas.py +++ b/enable/canvas.py @@ -108,7 +108,7 @@ def remove(self, *components): def draw(self, gc, view_bounds=None, mode="normal"): if self.view_bounds is None: self.view_bounds = view_bounds - super(Canvas, self).draw(gc, view_bounds, mode) + super().draw(gc, view_bounds, mode) # ------------------------------------------------------------------------ # Protected methods diff --git a/enable/component.py b/enable/component.py index c53c78879..c9344660e 100644 --- a/enable/component.py +++ b/enable/component.py @@ -381,11 +381,11 @@ def __init__(self, **traits): # After the component is otherwise configured, make sure our # container gets notified of our being added to it. container = traits.pop("container") - super(Component, self).__init__(**traits) + super().__init__(**traits) self._set_padding_traits(padding, padding_traits) container.add(self) else: - super(Component, self).__init__(**traits) + super().__init__(**traits) self._set_padding_traits(padding, padding_traits) def draw(self, gc, view_bounds=None, mode="default"): diff --git a/enable/component_editor.py b/enable/component_editor.py index 9dc3279cd..56ff79623 100644 --- a/enable/component_editor.py +++ b/enable/component_editor.py @@ -59,7 +59,7 @@ def dispose(self): self._window.cleanup() self._window = None self._parent = None - super(_ComponentEditor, self).dispose() + super().dispose() def update_editor(self): """ Updates the editor when the object trait changes externally to the diff --git a/enable/constraints_container.py b/enable/constraints_container.py index 372454b5d..9cbffc25d 100644 --- a/enable/constraints_container.py +++ b/enable/constraints_container.py @@ -211,7 +211,7 @@ def will_transfer(self): def _bounds_changed(self, old, new): """ Run the solver when the container's bounds change. """ - super(ConstraintsContainer, self)._bounds_changed(old, new) + super()._bounds_changed(old, new) self.refresh() def _layout_constraints_changed(self): diff --git a/enable/container.py b/enable/container.py index cdf5b260b..69e14732b 100644 --- a/enable/container.py +++ b/enable/container.py @@ -431,7 +431,7 @@ def _container_handle_mouse_event(self, event, suffix): should be set to True, and contained components will not be called with the event. """ - # super(Container, self)._dispatch_stateful_event(event, suffix) + # super()._dispatch_stateful_event(event, suffix) Component._dispatch_stateful_event(self, event, suffix) def get_event_transform(self, event=None, suffix=""): @@ -574,12 +574,12 @@ def _fit_window_changed(self, old, new): def _bounds_changed(self, old, new): # crappy... calling our parent's handler seems like a common traits # event handling problem - super(Container, self)._bounds_changed(old, new) + super()._bounds_changed(old, new) self._layout_needed = True self.invalidate_draw() def _bounds_items_changed(self, event): - super(Container, self)._bounds_items_changed(event) + super()._bounds_items_changed(event) self._layout_needed = True self.invalidate_draw() diff --git a/enable/drawing/drawing_canvas.py b/enable/drawing/drawing_canvas.py index 3f4b149c6..4ec4f8c8f 100644 --- a/enable/drawing/drawing_canvas.py +++ b/enable/drawing/drawing_canvas.py @@ -123,7 +123,7 @@ class ToolbarButton(Button): def __init__(self, *args, **kw): toolbar = kw.pop("toolbar", None) - super(ToolbarButton, self).__init__(*args, **kw) + super().__init__(*args, **kw) if toolbar: self.toolbar = toolbar toolbar.add(self) @@ -171,7 +171,7 @@ def _canvas_bounds_updated(self, event): self.y = self.canvas.height - self.height def _dispatch_stateful_event(self, event, suffix): - super(DrawingCanvasToolbar, self)._dispatch_stateful_event( + super()._dispatch_stateful_event( event, suffix ) event.handled = True @@ -219,7 +219,7 @@ def dispatch(self, event, suffix): for tool in self.listening_tools: tool.dispatch(event, suffix) - super(DrawingCanvas, self).dispatch(event, suffix) + super().dispatch(event, suffix) def activate(self, tool): """ @@ -233,7 +233,7 @@ def _draw_container_mainlayer(self, gc, view_bounds=None, mode="default"): if active_tool and active_tool.draw_mode == "exclusive": active_tool.draw(gc, view_bounds, mode) else: - # super(DrawingCanvas, self)._draw(gc, view_bounds, mode) + # super()._draw(gc, view_bounds, mode) for tool in self.listening_tools: tool.draw(gc, view_bounds, mode) if active_tool: diff --git a/enable/examples/demo/enable/container_demo.py b/enable/examples/demo/enable/container_demo.py index d0193e373..b6312f331 100644 --- a/enable/examples/demo/enable/container_demo.py +++ b/enable/examples/demo/enable/container_demo.py @@ -25,7 +25,7 @@ class Region(PlotComponent, DragTool): _offset = Tuple def __init__(self, color=None, **kw): - super(Region, self).__init__(**kw) + super().__init__(**kw) if color: self.color = color if "bounds" not in kw: @@ -55,7 +55,7 @@ class Overlay(AbstractOverlay): margin = Int(8) def __init__(self, text="", *args, **kw): - super(Overlay, self).__init__(*args, **kw) + super().__init__(*args, **kw) self.text = text def overlay(self, component, gc, view_bounds=None, mode="normal"): diff --git a/enable/examples/demo/savage/buttons_on_canvas.py b/enable/examples/demo/savage/buttons_on_canvas.py index 552cd21b6..1ed9d20c6 100644 --- a/enable/examples/demo/savage/buttons_on_canvas.py +++ b/enable/examples/demo/savage/buttons_on_canvas.py @@ -38,7 +38,7 @@ class CanvasButton(Component): bounds = [64, 64] def __init__(self, filename, callback, callback_args, *args, **kw): - super(CanvasButton, self).__init__(*args, **kw) + super().__init__(*args, **kw) self.document = self._load_svg_document(filename) @@ -135,7 +135,7 @@ class ButtonCanvasView(HasTraits): ) def __init__(self, *args, **kw): - super(ButtonCanvasView, self).__init__(*args, **kw) + super().__init__(*args, **kw) self.add_buttons() def _canvas_default(self): diff --git a/enable/examples/demo/savage/static_image.py b/enable/examples/demo/savage/static_image.py index 9688376ba..5277f2a6e 100644 --- a/enable/examples/demo/savage/static_image.py +++ b/enable/examples/demo/savage/static_image.py @@ -30,7 +30,7 @@ class StaticImageExample(HasTraits): ) def __init__(self, filename, renderer, *args, **kw): - super(StaticImageExample, self).__init__(*args, **kw) + super().__init__(*args, **kw) self.svg = SVGDocument.createFromFile(filename, renderer=renderer) diff --git a/enable/graphics_context.py b/enable/graphics_context.py index d51a114d2..f0c14f03f 100644 --- a/enable/graphics_context.py +++ b/enable/graphics_context.py @@ -35,15 +35,13 @@ class EnableGCMixin(object): def __init__(self, *args, **kwargs): if "window" in kwargs: self.window = kwargs.pop("window") - super(EnableGCMixin, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def clip_to_rect(self, x, y, width, height): if getattr(self, "corner_pixel_origin", True): - super(EnableGCMixin, self).clip_to_rect( - x - 0.5, y - 0.5, width + 1, height + 1 - ) + super().clip_to_rect(x - 0.5, y - 0.5, width + 1, height + 1) else: - super(EnableGCMixin, self).clip_to_rect(x, y, width, height) + super().clip_to_rect(x, y, width, height) def clear_clip(self, color, coordinates): """ Clip and clear a Kiva graphics context to a specified area and diff --git a/enable/layout/constraints_namespace.py b/enable/layout/constraints_namespace.py index 992fcc5a2..98dd92124 100644 --- a/enable/layout/constraints_namespace.py +++ b/enable/layout/constraints_namespace.py @@ -50,7 +50,7 @@ def __getattr__(self, name): """ try: - return super(ConstraintsNamespace, self).__getattr__(name) + return super().__getattr__(name) except AttributeError: pass @@ -77,4 +77,4 @@ def __setattr__(self, name, value): if isinstance(value, LinearSymbolic): self._constraints[name] = value else: - super(ConstraintsNamespace, self).__setattr__(name, value) + super().__setattr__(name, value) diff --git a/enable/layout/layout_helpers.py b/enable/layout/layout_helpers.py index 553e0b5a3..dc7cc63f0 100644 --- a/enable/layout/layout_helpers.py +++ b/enable/layout/layout_helpers.py @@ -190,7 +190,7 @@ def __init__(self, func, *args, **kwds): **kwds The keyword arguments to pass to 'func'. """ - super(DeferredConstraintsFunction, self).__init__() + super().__init__() self.func = func self.args = args self.kwds = kwds @@ -228,7 +228,7 @@ def __init__(self, orientation, *items, **config): inter-element spacing to use during abutment. The default is the value of DefaultSpacing.ABUTMENT. """ - super(AbutmentHelper, self).__init__() + super().__init__() self.orientation = orientation self.items = items self.spacing = config.get("spacing", DefaultSpacing.ABUTMENT) @@ -277,7 +277,7 @@ def __init__(self, anchor, *items, **config): inter-element spacing to use during alignement. The default is the value of DefaultSpacing.ALIGNMENT. """ - super(AlignmentHelper, self).__init__() + super().__init__() self.anchor = anchor self.items = items self.spacing = config.get("spacing", DefaultSpacing.ALIGNMENT) @@ -322,7 +322,7 @@ def __init__(self, name): A string name to prepend to a unique owner id generated for this box helper, to aid in debugging. """ - super(BoxHelper, self).__init__() + super().__init__() owner = uuid4().hex[:8] self.constraints_id = name + "|" + owner self._namespace = ConstraintsNamespace(name, owner) @@ -382,7 +382,7 @@ def __init__(self, orientation, *items, **config): the bounds of the box. The default is the value of DefaultSpacing.BOX_MARGIN. """ - super(LinearBoxHelper, self).__init__(orientation[0] + "box") + super().__init__(orientation[0] + "box") self.items = items self.orientation = orientation self.ortho_orientation = self.ortho_map[orientation] @@ -562,7 +562,7 @@ def __init__(self, *rows, **config): the bounds of the grid. The default is the value of DefaultSpacing.BOX_MARGIN. """ - super(GridHelper, self).__init__("grid") + super().__init__("grid") self.grid_rows = rows self.row_align = config.get("row_align", "") self.col_align = config.get("col_align", "") diff --git a/enable/null/quartz.py b/enable/null/quartz.py index 00de42ac9..4cac59fb5 100644 --- a/enable/null/quartz.py +++ b/enable/null/quartz.py @@ -43,9 +43,7 @@ def __init__(self, size_or_array, *args, **kwds): # No initialization. image = None width, height = size_or_array - super(GraphicsContext, self).__init__( - (width, height), gc, *args, **kwds - ) + super().__init__((width, height), gc, *args, **kwds) if image is not None: self.draw_image(image) diff --git a/enable/primitives/image.py b/enable/primitives/image.py index 11d24acfd..0b5884ab4 100644 --- a/enable/primitives/image.py +++ b/enable/primitives/image.py @@ -50,7 +50,7 @@ def from_file(cls, filename, **traits): def __init__(self, data, **traits): # the default bounds are the size of the image traits.setdefault("bounds", data.shape[1::-1]) - super(Image, self).__init__(data=data, **traits) + super().__init__(data=data, **traits) def _draw_mainlayer(self, gc, view_bounds=None, mode="normal"): """ Draws the image. """ diff --git a/enable/qt4/base_window.py b/enable/qt4/base_window.py index 54c478057..e4a72537f 100644 --- a/enable/qt4/base_window.py +++ b/enable/qt4/base_window.py @@ -231,13 +231,13 @@ class _QtWindow(QtGui.QWidget): """ The Qt widget that implements the enable control. """ def __init__(self, parent, enable_window): - super(_QtWindow, self).__init__(parent) + super().__init__(parent) self.setAcceptDrops(True) self.handler = _QtWindowHandler(self, enable_window) def closeEvent(self, event): self.handler.closeEvent(event) - return super(_QtWindow, self).closeEvent(event) + return super().closeEvent(event) def paintEvent(self, event): self.handler.paintEvent(event) @@ -285,26 +285,26 @@ def dropEvent(self, event): self.handler.dropEvent(event) def sizeHint(self): - qt_size_hint = super(_QtWindow, self).sizeHint() + qt_size_hint = super().sizeHint() return self.handler.sizeHint(qt_size_hint) class _QtGLWindow(QtOpenGL.QGLWidget): def __init__(self, parent, enable_window): - super(_QtGLWindow, self).__init__(parent) + super().__init__(parent) self.handler = _QtWindowHandler(self, enable_window) def closeEvent(self, event): self.handler.closeEvent(event) - return super(_QtGLWindow, self).closeEvent(event) + return super().closeEvent(event) def paintEvent(self, event): - super(_QtGLWindow, self).paintEvent(event) + super().paintEvent(event) self.handler.paintEvent(event) self.swapBuffers() def resizeEvent(self, event): - super(_QtGLWindow, self).resizeEvent(event) + super().resizeEvent(event) self.handler.resizeEvent(event) def keyPressEvent(self, event): diff --git a/enable/qt4/gl.py b/enable/qt4/gl.py index 28e20430a..075cb44b7 100644 --- a/enable/qt4/gl.py +++ b/enable/qt4/gl.py @@ -33,7 +33,7 @@ def _init_gc(self): """ self.control.makeCurrent() self._fake_pyglet_context.set_current() - super(Window, self)._init_gc() + super()._init_gc() def _paint(self, event=None): """ Paint the contents of the window. diff --git a/enable/qt4/scrollbar.py b/enable/qt4/scrollbar.py index 16b3c42f5..f639eebab 100644 --- a/enable/qt4/scrollbar.py +++ b/enable/qt4/scrollbar.py @@ -61,7 +61,7 @@ class QResizableScrollBar(QtGui.QScrollBar): resized = QtCore.Signal() def resizeEvent(self, event): - super(QResizableScrollBar, self).resizeEvent(event) + super().resizeEvent(event) self.resized.emit() @@ -277,22 +277,22 @@ def _scroll_position_changed(self): self.request_redraw() def _bounds_changed(self, old, new): - super(NativeScrollBar, self)._bounds_changed(old, new) + super()._bounds_changed(old, new) self._widget_moved = True self.request_redraw() def _bounds_items_changed(self, event): - super(NativeScrollBar, self)._bounds_items_changed(event) + super()._bounds_items_changed(event) self._widget_moved = True self.request_redraw() def _position_changed(self, old, new): - super(NativeScrollBar, self)._position_changed(old, new) + super()._position_changed(old, new) self._widget_moved = True self.request_redraw() def _position_items_changed(self, event): - super(NativeScrollBar, self)._position_items_changed(event) + super()._position_items_changed(event) self._widget_moved = True self.request_redraw() diff --git a/enable/savage/compliance/comparator.py b/enable/savage/compliance/comparator.py index 33d801ea5..e4c393b20 100644 --- a/enable/savage/compliance/comparator.py +++ b/enable/savage/compliance/comparator.py @@ -56,7 +56,7 @@ class ComponentTrait(Instance): def __init__(self, **kwds): kwds.setdefault("klass", Component) - super(ComponentTrait, self).__init__(**kwds) + super().__init__(**kwds) def create_editor(self): return ComponentEditor() @@ -218,7 +218,7 @@ class Comparator(HasTraits): ) def __init__(self, **traits): - super(Comparator, self).__init__(**traits) + super().__init__(**traits) kiva_ch = activate_tool( self.kiva_component, Crosshair(self.kiva_component) ) diff --git a/enable/savage/compliance/crosshair.py b/enable/savage/compliance/crosshair.py index e943e4093..f25132d01 100644 --- a/enable/savage/compliance/crosshair.py +++ b/enable/savage/compliance/crosshair.py @@ -99,7 +99,7 @@ class MultiController(HasTraits): crosshairs = List() def __init__(self, *crosshairs, **traits): - super(MultiController, self).__init__(**traits) + super().__init__(**traits) for ch in crosshairs: self.add(ch) diff --git a/enable/savage/compliance/drawer.py b/enable/savage/compliance/drawer.py index 402549b24..2b6019b9e 100644 --- a/enable/savage/compliance/drawer.py +++ b/enable/savage/compliance/drawer.py @@ -17,7 +17,7 @@ class PathGrid(wx.grid.Grid): def __init__(self, parent, pathOps): - super(PathGrid, self).__init__(parent) + super().__init__(parent) self.CreateGrid(100, 10) firstColAttr = wx.grid.GridCellAttr() choices = sorted(pathOps.keys()) @@ -31,9 +31,7 @@ class PathPanel(wx.Panel): path = None def __init__(self, parent, contextSource): - super(PathPanel, self).__init__( - parent, style=wx.FULL_REPAINT_ON_RESIZE - ) + super().__init__(parent, style=wx.FULL_REPAINT_ON_RESIZE) self.contextSource = contextSource self.Bind(wx.EVT_PAINT, self.OnPaint) diff --git a/enable/savage/compliance/sike.py b/enable/savage/compliance/sike.py index 5c2f88416..f23052481 100644 --- a/enable/savage/compliance/sike.py +++ b/enable/savage/compliance/sike.py @@ -171,9 +171,7 @@ class ProfileResults(HasTraits): def trait_view(self, name=None, view_element=None): if name or view_element is not None: - return super(ProfileResults, self).trait_view( - name=name, view_element=view_element - ) + return super().trait_view(name=name, view_element=view_element) view = View( Group(Item("total_time", style="readonly")), diff --git a/enable/savage/compliance/viewer.py b/enable/savage/compliance/viewer.py index a93dd0a8f..cb5105cf2 100644 --- a/enable/savage/compliance/viewer.py +++ b/enable/savage/compliance/viewer.py @@ -21,7 +21,7 @@ class ReferencePanel(wx.Panel): def __init__(self, parent, bmp): - super(ReferencePanel, self).__init__(parent) + super().__init__(parent) self.bmp = bmp self.Bind(wx.EVT_PAINT, self.OnPaint) @@ -35,7 +35,7 @@ def OnPaint(self, evt): class ProfileResults(wx.TextCtrl): def __init__(self, parent): - super(ProfileResults, self).__init__(parent, style=wx.TE_MULTILINE) + super().__init__(parent, style=wx.TE_MULTILINE) self.SetFont( wx.Font( 10, diff --git a/enable/savage/svg/css/identifier.py b/enable/savage/svg/css/identifier.py index b3cee8b79..001169d75 100644 --- a/enable/savage/svg/css/identifier.py +++ b/enable/savage/svg/css/identifier.py @@ -16,7 +16,7 @@ class White(White): """ Customize whitespace to match the CSS spec values""" def __init__(self, ws=" \t\r\n\f", min=1, max=0, exact=0): - super(White, self).__init__(ws, min, max, exact) + super().__init__(ws, min, max, exact) escaped = ( diff --git a/enable/savage/svg/pathdata.py b/enable/savage/svg/pathdata.py index cc3f36102..6355e9322 100644 --- a/enable/savage/svg/pathdata.py +++ b/enable/savage/svg/pathdata.py @@ -39,7 +39,7 @@ class CaselessPreservingLiteral(CaselessLiteral): """ def __init__(self, matchString): - super(CaselessPreservingLiteral, self).__init__(matchString.upper()) + super().__init__(matchString.upper()) self.name = "'%s'" % matchString self.errmsg = "Expected " + self.name diff --git a/enable/savage/trait_defs/ui/svg_button.py b/enable/savage/trait_defs/ui/svg_button.py index f3f5f55a6..83b0e79dd 100644 --- a/enable/savage/trait_defs/ui/svg_button.py +++ b/enable/savage/trait_defs/ui/svg_button.py @@ -75,4 +75,4 @@ def __init__(self, label="", filename=None, tooltip="", toggle=False, view=view, ) - super(SVGButton, self).__init__(**metadata) + super().__init__(**metadata) diff --git a/enable/savage/trait_defs/ui/svg_button_editor.py b/enable/savage/trait_defs/ui/svg_button_editor.py index eead34dce..57bd94007 100644 --- a/enable/savage/trait_defs/ui/svg_button_editor.py +++ b/enable/savage/trait_defs/ui/svg_button_editor.py @@ -78,7 +78,7 @@ class SVGButtonEditor(BasicEditorFactory): def __init__(self, **traits): self._value = 0 - super(SVGButtonEditor, self).__init__(**traits) + super().__init__(**traits) # ------------------------------------------------------------------------- # Traits properties diff --git a/enable/savage/trait_defs/ui/wx/kiva_render_panel.py b/enable/savage/trait_defs/ui/wx/kiva_render_panel.py index 396139c4b..2acc0f927 100644 --- a/enable/savage/trait_defs/ui/wx/kiva_render_panel.py +++ b/enable/savage/trait_defs/ui/wx/kiva_render_panel.py @@ -38,7 +38,7 @@ def draw(self, gc, view_bounds=None, mode="default"): class RenderPanel(wx.Window): def __init__(self, parent, document=None): - super(RenderPanel, self).__init__(parent) + super().__init__(parent) self.document = document if self.document is not None: diff --git a/enable/savage/trait_defs/ui/wx/svg_button_editor.py b/enable/savage/trait_defs/ui/wx/svg_button_editor.py index 47bbdb590..a39809b6a 100644 --- a/enable/savage/trait_defs/ui/wx/svg_button_editor.py +++ b/enable/savage/trait_defs/ui/wx/svg_button_editor.py @@ -42,7 +42,7 @@ def __init__(self, parent, button, padding=(8, 8)): self.padding = padding - super(ButtonRenderPanel, self).__init__(parent, document=self.document) + super().__init__(parent, document=self.document) def DoGetBestSize(self): label = self.button.factory.label diff --git a/enable/savage/trait_defs/ui/wx/wx_render_panel.py b/enable/savage/trait_defs/ui/wx/wx_render_panel.py index 668d833d7..ffd625956 100644 --- a/enable/savage/trait_defs/ui/wx/wx_render_panel.py +++ b/enable/savage/trait_defs/ui/wx/wx_render_panel.py @@ -17,7 +17,7 @@ class RenderPanel(wx.Panel): def __init__(self, parent, document=None): - super(RenderPanel, self).__init__(parent) + super().__init__(parent) self.lastRender = None self.document = document self.zoom_x = 100 diff --git a/enable/scrolled.py b/enable/scrolled.py index 1d7337540..00dfc2fd6 100644 --- a/enable/scrolled.py +++ b/enable/scrolled.py @@ -612,7 +612,7 @@ def _container_handle_mouse_event(self, event, suffix): # ------------------------------------------------------------------------- def __getstate__(self): - state = super(Scrolled, self).__getstate__() + state = super().__getstate__() for key in ["alternate_vsb", "_vsb", "_hsb"]: if key in state: del state[key] diff --git a/enable/tests/test_event_transform.py b/enable/tests/test_event_transform.py index f2a0c32c7..0f67a9781 100644 --- a/enable/tests/test_event_transform.py +++ b/enable/tests/test_event_transform.py @@ -42,7 +42,7 @@ class TestComponent(Component): last_event = Any def _dispatch_stateful_event(self, event, suffix): - super(TestComponent, self)._dispatch_stateful_event(event, suffix) + super()._dispatch_stateful_event(event, suffix) self.last_event = copy.copy(event) @@ -51,7 +51,7 @@ class TestContainer(Container): last_event = Any def _dispatch_stateful_event(self, event, suffix): - super(TestContainer, self)._dispatch_stateful_event(event, suffix) + super()._dispatch_stateful_event(event, suffix) self.last_event = copy.copy(event) @@ -60,7 +60,7 @@ class TestCanvas(Canvas): last_event = Any def _dispatch_stateful_event(self, event, suffix): - super(TestCanvas, self)._dispatch_stateful_event(event, suffix) + super()._dispatch_stateful_event(event, suffix) self.last_event = copy.copy(event) diff --git a/enable/text_field.py b/enable/text_field.py index 5d2c8c66e..fd1b395e3 100644 --- a/enable/text_field.py +++ b/enable/text_field.py @@ -117,7 +117,7 @@ def __init__(self, **traits): # Initialize internal tracking variables self.reset() - super(TextField, self).__init__(**traits) + super().__init__(**traits) if self.metrics is None: self.metrics = font_metrics_provider() diff --git a/enable/text_field_grid.py b/enable/text_field_grid.py index c9f5cdc08..133b8fb0a 100644 --- a/enable/text_field_grid.py +++ b/enable/text_field_grid.py @@ -72,7 +72,7 @@ def __init__(self, columns, rows, **traits): self.rows = rows self.columns = columns self.selected_box = [] - super(TextFieldGrid, self).__init__(**traits) + super().__init__(**traits) def set_cell(self, row, column, text): if row < self.rows and column < self.columns: diff --git a/enable/tools/pyface/commands.py b/enable/tools/pyface/commands.py index 84bf07d6a..c02b95acf 100644 --- a/enable/tools/pyface/commands.py +++ b/enable/tools/pyface/commands.py @@ -35,7 +35,7 @@ class ComponentCommand(AbstractCommand): component_name = Unicode def __init__(self, component, **traits): - super(ComponentCommand, self).__init__(component=component, **traits) + super().__init__(component=component, **traits) # ------------------------------------------------------------------------- # traits handlers @@ -102,7 +102,7 @@ def __init__(self, component, new_rectangle=None, previous_rectangle=None, else: data = new_rectangle - super(ResizeCommand, self).__init__( + super().__init__( component=component, data=data, previous_rectangle=previous_rectangle, @@ -140,7 +140,7 @@ def merge(self, other): and isinstance(other, self.__class__) and other.component == self.component): return self._merge_data(other) - return super(ResizeCommand, self).merge(other) + return super().merge(other) def do(self): if self.previous_rectangle == (): @@ -231,7 +231,7 @@ def __init__(self, component, new_position=None, previous_position=None, else: data = new_position - super(MoveCommand, self).__init__( + super().__init__( component=component, data=data, previous_position=previous_position, @@ -256,7 +256,7 @@ def merge(self, other): and isinstance(other, self.__class__) and other.component == self.component): return self._merge_data(other) - return super(MoveCommand, self).merge(other) + return super().merge(other) # ------------------------------------------------------------------------- # Private interface diff --git a/enable/tools/pyface/move_command_tool.py b/enable/tools/pyface/move_command_tool.py index f5a7c99ec..65d0d36aa 100644 --- a/enable/tools/pyface/move_command_tool.py +++ b/enable/tools/pyface/move_command_tool.py @@ -49,7 +49,7 @@ def drag_start(self, event): if self.component: # we need to save the initial position to give to the Command self._initial_position = tuple(self.component.position) - return super(MoveCommandTool, self).drag_start(event) + return super().drag_start(event) def drag_end(self, event): """ End the drag operation, issuing a MoveCommands diff --git a/enable/tools/pyface/resize_command_tool.py b/enable/tools/pyface/resize_command_tool.py index 49ca24fbb..0ea34e47d 100644 --- a/enable/tools/pyface/resize_command_tool.py +++ b/enable/tools/pyface/resize_command_tool.py @@ -51,7 +51,7 @@ def drag_start(self, event): self._initial_rectangle = tuple( self.component.position + self.component.bounds ) - result = super(ResizeCommandTool, self).drag_start(event) + result = super().drag_start(event) return result def drag_end(self, event): @@ -68,7 +68,7 @@ def drag_end(self, event): ) self.command_stack.push(command) event.handled = True - return super(ResizeCommandTool, self).drag_end(event) + return super().drag_end(event) return True def drag_cancel(self, event): diff --git a/enable/tools/resize_tool.py b/enable/tools/resize_tool.py index a061f3031..246ea78d9 100644 --- a/enable/tools/resize_tool.py +++ b/enable/tools/resize_tool.py @@ -90,7 +90,7 @@ def is_draggable(self, x, y): def drag_start(self, event): if self.component is not None: self._selected_hotspot = self._find_hotspot(event.x, event.y) - super(ResizeTool, self).drag_start(event) + super().drag_start(event) self.component._layout_needed = True if self.auto_raise: # Push the component to the top of its container's list diff --git a/enable/tools/toolbars/viewport_toolbar.py b/enable/tools/toolbars/viewport_toolbar.py index 188a81d50..3d6d4a1e9 100644 --- a/enable/tools/toolbars/viewport_toolbar.py +++ b/enable/tools/toolbars/viewport_toolbar.py @@ -46,7 +46,7 @@ def __init__(self, component=None, *args, **kw): # self.component should be a CanvasViewport if component is not None: kw["component"] = component - super(ViewportToolbar, self).__init__(**kw) + super().__init__(**kw) for buttontype in self.buttons: self.add_button(buttontype()) diff --git a/enable/tools/viewport_zoom_tool.py b/enable/tools/viewport_zoom_tool.py index 46b4bd1bb..af0e45c85 100644 --- a/enable/tools/viewport_zoom_tool.py +++ b/enable/tools/viewport_zoom_tool.py @@ -150,7 +150,7 @@ def __init__(self, component=None, *args, **kw): # the component as the first positional argument. if component is not None: kw["component"] = component - super(ViewportZoomTool, self).__init__(**kw) + super().__init__(**kw) self._reset_state_to_current() if self.tool_mode == "range": diff --git a/enable/trait_defs/ui/wx/rgba_color_editor.py b/enable/trait_defs/ui/wx/rgba_color_editor.py index 26fb1dce9..fee45dca0 100644 --- a/enable/trait_defs/ui/wx/rgba_color_editor.py +++ b/enable/trait_defs/ui/wx/rgba_color_editor.py @@ -293,7 +293,7 @@ def dispose(self): """ Disposes of the contents of an editor. """ self.control._swatch_editor.dispose() - super(CustomColorEditor, self).dispose() + super().dispose() # ------------------------------------------------------------------------- # Updates the editor when the object trait changes external to the editor: diff --git a/enable/viewable.py b/enable/viewable.py index a07ae45f7..1d6bdbc77 100644 --- a/enable/viewable.py +++ b/enable/viewable.py @@ -32,4 +32,4 @@ def draw(self, gc, view_bounds=None, mode="default"): for view in self.viewports: view.draw(gc, view_bounds, mode) else: - super(Viewable, self).draw(gc, view_bounds, mode) + super().draw(gc, view_bounds, mode) diff --git a/enable/viewport.py b/enable/viewport.py index eea8375c0..844b75e1f 100644 --- a/enable/viewport.py +++ b/enable/viewport.py @@ -135,7 +135,7 @@ def invalidate_draw(self, damaged_regions=None, self_relative=False, ] for region in damaged_regions ] - super(Viewport, self).invalidate_draw( + super().invalidate_draw( damaged_regions=damaged_regions, self_relative=self_relative ) @@ -157,7 +157,7 @@ def get_preferred_size(self): ) return self._component_preferred_size else: - return super(Viewport, self).get_preferred_size() + return super().get_preferred_size() def viewport_to_component(self, x, y): """ Given a coordinate X and Y in the viewport's coordinate system, @@ -269,7 +269,7 @@ def _do_layout(self): self.component.do_layout() else: - super(Viewport, self)._do_layout() + super()._do_layout() def _dispatch_stateful_event(self, event, suffix): if isinstance(self.component, Component): diff --git a/enable/wx/gl.py b/enable/wx/gl.py index 4eecf94ec..52ab4f005 100644 --- a/enable/wx/gl.py +++ b/enable/wx/gl.py @@ -26,7 +26,7 @@ class Window(BaseWindow): control = Instance(GLCanvas) def __init__(self, *args, **kw): - super(Window, self).__init__(*args, **kw) + super().__init__(*args, **kw) # If we are using the GL backend, we will need to have a pyglet # GL context @@ -61,7 +61,7 @@ def _init_gc(self): dc = wx.PaintDC(self.control) self._pyglet_gl_context.set_current() self.control.SetCurrent() - super(Window, self)._init_gc() + super()._init_gc() def _paint(self, event=None): """ Paint the contents of the window. diff --git a/enable/wx/quartz.py b/enable/wx/quartz.py index 8283a1aa9..5ae1aaadf 100644 --- a/enable/wx/quartz.py +++ b/enable/wx/quartz.py @@ -45,9 +45,7 @@ def __init__(self, size_or_array, *args, **kwds): image = None width, height = size_or_array - super(GraphicsContext, self).__init__( - (width, height), gc, *args, **kwds - ) + super().__init__((width, height), gc, *args, **kwds) if image is not None: self.draw_image(image) @@ -58,7 +56,7 @@ def create_from_gc(klass, gc, size_or_array, *args, **kwds): class _WindowGraphicsContext(ABCGI.CGContextInABox): def __init__(self, *args, **kwds): - super(_WindowGraphicsContext, self).__init__(*args, **kwds) + super().__init__(*args, **kwds) self._begun = False def begin(self): diff --git a/enable/wx/scrollbar.py b/enable/wx/scrollbar.py index 0e27b1fec..1cbaaa832 100644 --- a/enable/wx/scrollbar.py +++ b/enable/wx/scrollbar.py @@ -291,22 +291,22 @@ def _scroll_position_changed(self): self.request_redraw() def _bounds_changed(self, old, new): - super(NativeScrollBar, self)._bounds_changed(old, new) + super()._bounds_changed(old, new) self._widget_moved = True self.request_redraw() def _bounds_items_changed(self, event): - super(NativeScrollBar, self)._bounds_items_changed(event) + super()._bounds_items_changed(event) self._widget_moved = True self.request_redraw() def _position_changed(self, old, new): - super(NativeScrollBar, self)._position_changed(old, new) + super()._position_changed(old, new) self._widget_moved = True self.request_redraw() def _position_items_changed(self, event): - super(NativeScrollBar, self)._position_items_changed(event) + super()._position_items_changed(event) self._widget_moved = True self.request_redraw() diff --git a/kiva/basecore2d.py b/kiva/basecore2d.py index fbc9a7201..9c6479345 100644 --- a/kiva/basecore2d.py +++ b/kiva/basecore2d.py @@ -98,7 +98,7 @@ class GraphicsContextBase(AbstractGraphicsContext): """ def __init__(self, *args, **kwargs): - super(GraphicsContextBase, self).__init__() + super().__init__() self.state = GraphicsState() # The line state has multiple properties that are tracked by a class diff --git a/kiva/blend2d.py b/kiva/blend2d.py index a4bc99a01..097d7347f 100644 --- a/kiva/blend2d.py +++ b/kiva/blend2d.py @@ -44,7 +44,7 @@ class GraphicsContext(object): def __init__(self, size, *args, **kwargs): - super(GraphicsContext, self).__init__() + super().__init__() self._width = size[0] self._height = size[1] self.pix_format = kwargs.get("pix_format", "rgba32") diff --git a/kiva/cairo.py b/kiva/cairo.py index 35a41656a..c559b18e5 100644 --- a/kiva/cairo.py +++ b/kiva/cairo.py @@ -210,7 +210,7 @@ def copy(self): class GraphicsContext(basecore2d.GraphicsContextBase): def __init__(self, size, *args, **kw): - super(GraphicsContext, self).__init__(size, *args, **kw) + super().__init__(size, *args, **kw) w, h = size self.surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, w, h) diff --git a/kiva/celiagg.py b/kiva/celiagg.py index 6d39599e4..f15f47190 100644 --- a/kiva/celiagg.py +++ b/kiva/celiagg.py @@ -84,7 +84,7 @@ class GraphicsContext(object): def __init__(self, size, *args, **kwargs): - super(GraphicsContext, self).__init__() + super().__init__() self._width = size[0] self._height = size[1] self.pix_format = kwargs.get('pix_format', 'bgra32') diff --git a/kiva/gl/__init__.py b/kiva/gl/__init__.py index 89ff620f8..e06e81223 100644 --- a/kiva/gl/__init__.py +++ b/kiva/gl/__init__.py @@ -466,11 +466,11 @@ def __init__(self, size, *args, **kw): self._text_pos = (0, 0) def save_state(self): - super(GraphicsContext, self).save_state() + super().save_state() self._font_stack.append(self._current_font) def restore_state(self): - super(GraphicsContext, self).restore_state() + super().restore_state() self._current_font = self._font_stack.pop() def set_font(self, font): diff --git a/kiva/graphics_state.py b/kiva/graphics_state.py index f30d629a9..60c86c49d 100644 --- a/kiva/graphics_state.py +++ b/kiva/graphics_state.py @@ -104,7 +104,7 @@ def __init__(self): # FIXME: This is a very wierd class. The following code is here to # make the basecore2d and the PS, SVG context managers happy - super(GraphicsState, self).__init__( + super().__init__( line_color, line_width, line_cap, line_join, line_dash ) self.line_state = self diff --git a/kiva/pdf.py b/kiva/pdf.py index 73ce2eeb6..308af38f9 100644 --- a/kiva/pdf.py +++ b/kiva/pdf.py @@ -84,7 +84,7 @@ def __init__(self, pdf_canvas, *args, **kwargs): self.text_xy = None, None # get an agg backend to assist in measuring text self._agg_gc = GraphicsContextImage((1, 1)) - super(GraphicsContext, self).__init__(self, *args, **kwargs) + super().__init__(self, *args, **kwargs) # ---------------------------------------------------------------- # Coordinate Transform Matrix Manipulation @@ -560,7 +560,7 @@ def set_alpha(self, alpha): """ self.gc.setFillAlpha(alpha) self.gc.setStrokeAlpha(alpha) - super(GraphicsContext, self).set_alpha(alpha) + super().set_alpha(alpha) # ---------------------------------------------------------------- # Drawing Images diff --git a/kiva/ps.py b/kiva/ps.py index b4df361a0..16c59c84f 100644 --- a/kiva/ps.py +++ b/kiva/ps.py @@ -100,7 +100,7 @@ def default_filter(kw1): class PSGC(basecore2d.GraphicsContextBase): def __init__(self, size, *args, **kwargs): - super(PSGC, self).__init__(size, *args, **kwargs) + super().__init__(size, *args, **kwargs) self.size = size self._height = size[1] self.contents = StringIO() diff --git a/kiva/qpainter.py b/kiva/qpainter.py index 4a4ad3104..c3d061908 100644 --- a/kiva/qpainter.py +++ b/kiva/qpainter.py @@ -63,7 +63,7 @@ class GraphicsContext(object): """ def __init__(self, size, *args, **kwargs): - super(GraphicsContext, self).__init__() + super().__init__() self._width = size[0] self._height = size[1] diff --git a/kiva/svg.py b/kiva/svg.py index 6980f4aef..24a500046 100644 --- a/kiva/svg.py +++ b/kiva/svg.py @@ -135,7 +135,7 @@ class CompiledPath(object): class GraphicsContext(basecore2d.GraphicsContextBase): def __init__(self, size, *args, **kwargs): - super(GraphicsContext, self).__init__(self, size, *args, **kwargs) + super().__init__(self, size, *args, **kwargs) self.size = size self._height = size[1] self.contents = StringIO()