Update "super" usage

chaco/abstract_controller.py

@@ -15,7 +15,7 @@ class AbstractController(Interactor):
 
     def __init__(self, component, *args, **kw):
         self.component = component
-        super(AbstractController, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
 
     def deactivate(self, component):
         """This method is called by the component when this controller is no

chaco/abstract_data_range.py

@@ -54,7 +54,7 @@ def __init__(self, *sources, **kwargs):
                 )
             else:
                 kwargs["sources"] = list(sources)
-        super(AbstractDataRange, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     # ------------------------------------------------------------------------
     # Abstract methods that subclasses must implement

chaco/abstract_overlay.py

@@ -33,7 +33,7 @@ class AbstractOverlay(PlotComponent):
     def __init__(self, component=None, *args, **kw):
         if component is not None:
             self.component = component
-        super(AbstractOverlay, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
 
     def overlay(self, other_component, gc, view_bounds=None, mode="normal"):
         """Draws this component overlaid on another component."""
@@ -49,10 +49,10 @@ def _draw(self, gc, view_bounds=None, mode="normal"):
         if self.component is not None:
             self.overlay(self.component, gc, view_bounds, mode)
         else:
-            super(AbstractOverlay, self)._draw(gc, view_bounds, mode)
+            super()._draw(gc, view_bounds, mode)
 
     def _request_redraw(self):
         """Overrides Enable Component."""
         if self.component is not None:
             self.component.request_redraw()
-        super(AbstractOverlay, self)._request_redraw()
+        super()._request_redraw()

chaco/array_data_source.py

@@ -294,7 +294,7 @@ def _metadata_items_changed(self, event):
     # ------------------------------------------------------------------------
 
     def __getstate__(self):
-        state = super(ArrayDataSource, self).__getstate__()
+        state = super().__getstate__()
         if not self.persist_data:
             state.pop("_data", None)
             state.pop("_cached_mask", None)
@@ -304,6 +304,6 @@ def __getstate__(self):
         return state
 
     def _post_load(self):
-        super(ArrayDataSource, self)._post_load()
+        super()._post_load()
         self._cached_bounds = ()
         self._cached_mask = None

chaco/axis.py

@@ -205,7 +205,7 @@ def __init__(self, component=None, **kwargs):
         self.tick_generator = DefaultTickGenerator()
         # Override init so that our component gets set last.  We want the
         # _component_changed() event handler to get run last.
-        super(PlotAxis, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         if component is not None:
             self.component = component
 
@@ -235,7 +235,7 @@ def _do_layout(self, *args, **kw):
         if self.component is not None:
             self._layout_as_overlay(*args, **kw)
         else:
-            super(PlotAxis, self)._do_layout(*args, **kw)
+            super()._do_layout(*args, **kw)
 
     def overlay(self, component, gc, view_bounds=None, mode="normal"):
         """Draws this component overlaid on another component.
@@ -686,12 +686,12 @@ def _calculate_geometry_overlay(self, overlay_component=None):
     # ------------------------------------------------------------------------
 
     def _bounds_changed(self, old, new):
-        super(PlotAxis, self)._bounds_changed(old, new)
+        super()._bounds_changed(old, new)
         self._layout_needed = True
         self._invalidate()
 
     def _bounds_items_changed(self, event):
-        super(PlotAxis, self)._bounds_items_changed(event)
+        super()._bounds_items_changed(event)
         self._layout_needed = True
         self._invalidate()
 
@@ -709,11 +709,11 @@ def mapper_updated(self, event=None):
         self._invalidate()
 
     def _position_changed(self, old, new):
-        super(PlotAxis, self)._position_changed(old, new)
+        super()._position_changed(old, new)
         self._cache_valid = False
 
     def _position_items_changed(self, event):
-        super(PlotAxis, self)._position_items_changed(event)
+        super()._position_items_changed(event)
         self._cache_valid = False
 
     def _position_changed_for_component(self):
@@ -832,7 +832,7 @@ def _title_angle_default(self):
     # ------------------------------------------------------------------------
 
     def __setstate__(self, state):
-        super(PlotAxis, self).__setstate__(state)
+        super().__setstate__(state)
         self._mapper_changed(None, self.mapper)
         self._reset_cache()
         self._cache_valid = False
@@ -845,7 +845,7 @@ class MinorPlotAxis(PlotAxis):
     """
 
     def __init__(self, *args, **kwargs):
-        super(MinorPlotAxis, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         if "tick_generator" not in kwargs:
             self.tick_generator = MinorTickGenerator()

chaco/barplot.py

@@ -155,7 +155,7 @@ def __init__(self, *args, **kw):
             if name in kw:
                 postponed[name] = kw.pop(name)
 
-        super(BarPlot, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
 
         # Set any keyword Traits that were postponed.
         self.trait_set(**postponed)
@@ -354,7 +354,7 @@ def _render_icon(self, gc, x, y, width, height):
             gc.draw_path(FILL_STROKE)
 
     def _post_load(self):
-        super(BarPlot, self)._post_load()
+        super()._post_load()
 
     # ------------------------------------------------------------------------
     # Properties
@@ -438,11 +438,11 @@ def _update_mappers(self):
         self._cache_valid = False
 
     def _bounds_changed(self, old, new):
-        super(BarPlot, self)._bounds_changed(old, new)
+        super()._bounds_changed(old, new)
         self._update_mappers()
 
     def _bounds_items_changed(self, event):
-        super(BarPlot, self)._bounds_items_changed(event)
+        super()._bounds_items_changed(event)
         self._update_mappers()
 
     def _orientation_changed(self):

chaco/base_1d_plot.py

@@ -330,19 +330,19 @@ def _invalidate_screen(self, event):
         self._screen_cache_valid = False
 
     def _bounds_changed(self, old, new):
-        super(Base1DPlot, self)._bounds_changed(old, new)
+        super()._bounds_changed(old, new)
         self._update_mappers()
 
     def _bounds_items_changed(self, event):
-        super(Base1DPlot, self)._bounds_items_changed(event)
+        super()._bounds_items_changed(event)
         self._update_mappers()
 
     def _position_changed(self, old, new):
-        super(Base1DPlot, self)._position_changed(old, new)
+        super()._position_changed(old, new)
         self._update_mappers()
 
     def _position_items_changed(self, event):
-        super(Base1DPlot, self)._position_items_changed(event)
+        super()._position_items_changed(event)
         self._update_mappers()
 
     def _updated_changed_for_index_mapper(self):

chaco/base_2d_plot.py

@@ -87,7 +87,7 @@ def __init__(self, **kwargs):
             if trait_name in kwargs:
                 kwargs_tmp[trait_name] = kwargs.pop(trait_name)
         self.trait_set(**kwargs_tmp)
-        super(Base2DPlot, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         if self.index is not None:
             self.index.observe(self._update_index_data, "data_changed")
         if self.index_mapper:
@@ -315,11 +315,11 @@ def _update_value_data(self, event=None):
     # ------------------------------------------------------------------------
 
     def _bounds_changed(self, old, new):
-        super(Base2DPlot, self)._bounds_changed(old, new)
+        super()._bounds_changed(old, new)
         self._update_index_mapper()
 
     def _bounds_items_changed(self, event):
-        super(Base2DPlot, self)._bounds_items_changed(event)
+        super()._bounds_items_changed(event)
         self._update_index_mapper()
 
     def _orientation_changed(self):

chaco/base_contour_plot.py

@@ -71,7 +71,7 @@ class BaseContourPlot(Base2DPlot):
     _color_map_trait = ColorTrait
 
     def __init__(self, *args, **kwargs):
-        super(BaseContourPlot, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if self.color_mapper:
             self.color_mapper.observe(self._update_color_mapper, "updated")
 

chaco/base_xy_plot.py

@@ -508,7 +508,7 @@ def _draw_default_axes(self, gc):
                     gc.stroke_path()
 
     def _post_load(self):
-        super(BaseXYPlot, self)._post_load()
+        super()._post_load()
         self._update_mappers()
         self.invalidate_draw()
         self._cache_valid = False
@@ -617,11 +617,11 @@ def _update_mappers(self):
         self._screen_cache_valid = False
 
     def _bounds_changed(self, old, new):
-        super(BaseXYPlot, self)._bounds_changed(old, new)
+        super()._bounds_changed(old, new)
         self._update_mappers()
 
     def _bounds_items_changed(self, event):
-        super(BaseXYPlot, self)._bounds_items_changed(event)
+        super()._bounds_items_changed(event)
         self._update_mappers()
 
     def _position_changed(self):
@@ -722,7 +722,7 @@ def _use_subdivision_changed(self, old, new):
     # ------------------------------------------------------------------------
 
     def __setstate__(self, state):
-        super(BaseXYPlot, self).__setstate__(state)
+        super().__setstate__(state)
         if self.index is not None:
             self.index.observe(self._either_data_updated, "data_changed")
         if self.value is not None:

chaco/cmap_image_plot.py

@@ -62,7 +62,7 @@ class CMapImagePlot(ImagePlot):
     # ------------------------------------------------------------------------
 
     def __init__(self, **kwargs):
-        super(CMapImagePlot, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         if self.value_mapper:
             self.value_mapper.observe(self._update_value_mapper, "updated")
         if self.value:
@@ -181,11 +181,11 @@ def _value_mapper_changed(self, old, new):
         self._update_value_mapper()
 
     def _value_data_changed_fired(self):
-        super(CMapImagePlot, self)._value_data_changed_fired()
+        super()._value_data_changed_fired()
         self._mapped_image_cache_valid = False
 
     def _index_data_changed_fired(self):
-        super(CMapImagePlot, self)._index_data_changed_fired()
+        super()._index_data_changed_fired()
         self._mapped_image_cache_valid = False
 
     def _cache_full_map_changed(self):

chaco/color_bar.py

@@ -98,7 +98,7 @@ def __init__(self, *args, **kw):
         grid_visible = kw.pop("grid_visible", True)
         axis_visible = kw.pop("axis_visible", True)
 
-        super(ColorBar, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
 
         if self.orientation == "h":
             if self.direction == "normal":
@@ -212,19 +212,19 @@ def _update_mappers(self):
         self.index_mapper.range = self.color_mapper.range
 
     def _bounds_changed(self, old, new):
-        super(ColorBar, self)._bounds_changed(old, new)
+        super()._bounds_changed(old, new)
         self._update_mappers()
 
     def _bounds_items_changed(self, event):
-        super(ColorBar, self)._bounds_items_changed(event)
+        super()._bounds_items_changed(event)
         self._update_mappers()
 
     def _position_changed(self, old, new):
-        super(ColorBar, self)._position_changed(old, new)
+        super()._position_changed(old, new)
         self._update_mappers()
 
     def _position_items_changed(self, event):
-        super(ColorBar, self)._position_items_changed(event)
+        super()._position_items_changed(event)
         self._update_mappers()
 
     def _updated_changed_for_index_mapper(self):

chaco/color_mapper.py

@@ -263,7 +263,7 @@ def __init__(self, segmentdata, **kwtraits):
         the transitions.
         """
         self._segmentdata = segmentdata
-        super(ColorMapper, self).__init__(**kwtraits)
+        super().__init__(**kwtraits)
 
     def map_screen(self, data_array):
         """Maps an array of data values to an array of colors."""

chaco/colormapped_scatterplot.py

@@ -32,7 +32,7 @@ class ColormappedScatterPlotView(ScatterPlotView):
     """TraitsUI View for customizing a color-mapped scatter plot."""
 
     def __init__(self):
-        super(ColormappedScatterPlotView, self).__init__()
+        super().__init__()
         vgroup = self.content
         vgroup.content[0].content.append(
             Item(
@@ -106,7 +106,7 @@ def map_screen(self, data_array):
         if len(data_array) > 0:
             if data_array.shape[1] == 3:
                 data_array = data_array[:, :2]
-        return super(ColormappedScatterPlot, self).map_screen(data_array)
+        return super().map_screen(data_array)
 
     def _draw_plot(self, gc, view_bounds=None, mode="normal"):
         """Draws the 'plot' layer.
@@ -121,9 +121,7 @@ def _draw_plot(self, gc, view_bounds=None, mode="normal"):
             # Take into account fill_alpha even if we are rendering with only two values
             old_color = self.color
             self.color = tuple(self.fill_alpha * array(self.color_))
-            super(ColormappedScatterPlot, self)._draw_component(
-                gc, view_bounds, mode
-            )
+            super()._draw_component(gc, view_bounds, mode)
             self.color = old_color
         else:
             colors = self._cached_data_pts[:, 2]
@@ -188,7 +186,7 @@ def _render(self, gc, points):
         """
         # If we don't have a color data set, then use the base class to render
         if (self.color_mapper is None) or (self.color_data is None):
-            return super(ColormappedScatterPlot, self)._render(gc, points)
+            return super()._render(gc, points)
 
         # If the GC doesn't have draw_*_at_points, then use bruteforce
         if hasattr(gc, "draw_marker_at_points") or hasattr(

chaco/colormapped_selection_overlay.py

@@ -47,7 +47,7 @@ class ColormappedSelectionOverlay(AbstractOverlay):
     _old_line_width = Float(0.0)
 
     def __init__(self, component=None, **kw):
-        super(ColormappedSelectionOverlay, self).__init__(**kw)
+        super().__init__(**kw)
         self.component = component
 
     def overlay(self, component, gc, view_bounds=None, mode="normal"):

chaco/contour_line_plot.py

@@ -137,7 +137,7 @@ def _update_contours(self):
 
     def _update_levels(self):
         """ Extends the parent method to also invalidate some other things """
-        super(ContourLinePlot, self)._update_levels()
+        super()._update_levels()
         self._contour_cache_valid = False
         self._widths_cache_valid = False
         self._styles_cache_valid = False

chaco/contour_poly_plot.py

@@ -95,7 +95,7 @@ def _update_polys(self):
 
     def _update_levels(self):
         """ Extends the parent method to also invalidate some other things """
-        super(ContourPolyPlot, self)._update_levels()
+        super()._update_levels()
         self._poly_cache_valid = False
 
     def _update_colors(self):

chaco/data_range_2d.py

@@ -116,7 +116,7 @@ def set_bounds(self, low, high):
     # ------------------------------------------------------------------------
 
     def __init__(self, *args, **kwargs):
-        super(DataRange2D, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def reset(self):
         """Resets the bounds of this range."""