From 02eb019c57090e13ab79355b614e46ffc74ab6fa Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Wed, 21 Apr 2021 04:26:31 +0000 Subject: [PATCH 1/4] FIX : Update class when calling super in canvas we were using `super(Container, self)` from inside `Canvas`, which seems like an unintentional bug --- enable/canvas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enable/canvas.py b/enable/canvas.py index 4dee2666a..68d8dd386 100644 --- a/enable/canvas.py +++ b/enable/canvas.py @@ -159,7 +159,7 @@ def _draw_underlay(self, gc, view_bounds=None, mode="default"): gc.move_to(x, 0) gc.line_to(x2, 0) gc.stroke_path() - super(Container, self)._draw_underlay(gc, view_bounds, mode) + super(Canvas, self)._draw_underlay(gc, view_bounds, mode) def _transform_view_bounds(self, view_bounds): # Overload the parent class's implementation to skip visibility test From 18d77ccde109a0a33d6756cdc42fe8ada58a79c3 Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Wed, 21 Apr 2021 04:39:10 +0000 Subject: [PATCH 2/4] FIX : Update class when calling super in TextGrid --- enable/text_grid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enable/text_grid.py b/enable/text_grid.py index cd5654ee1..6ee30b33f 100644 --- a/enable/text_grid.py +++ b/enable/text_grid.py @@ -94,7 +94,7 @@ class TextGrid(Component): # ------------------------------------------------------------------------ def __init__(self, **kwtraits): - super(Component, self).__init__(**kwtraits) + super(TextGrid, self).__init__(**kwtraits) self.selected_cells = [] # ------------------------------------------------------------------------ From ffdc5269f859f87f20fc75df33ba6026c43516d0 Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Wed, 21 Apr 2021 04:49:10 +0000 Subject: [PATCH 3/4] CLN : Dont use super to call setUp in testcase --- enable/tests/tools/test_hover_tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enable/tests/tools/test_hover_tool.py b/enable/tests/tools/test_hover_tool.py index a670a7577..bab489b28 100644 --- a/enable/tests/tools/test_hover_tool.py +++ b/enable/tests/tools/test_hover_tool.py @@ -53,7 +53,7 @@ class GuiTestAssistant(object): class HoverToolTestCase(EnableTestAssistant, GuiTestAssistant, unittest.TestCase): def setUp(self): - super(HoverToolTestCase, self).setUp() + GuiTestAssistant.setUp(self) self.component = Component( position=[LOWER_BOUND, LOWER_BOUND], bounds=[SIZE, SIZE] ) From dd14f1e5d58880b9c1b7f2750e816f75df858a8d Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Wed, 21 Apr 2021 05:01:38 +0000 Subject: [PATCH 4/4] Dont pass any args to super calls --- enable/canvas.py | 2 +- enable/text_grid.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/enable/canvas.py b/enable/canvas.py index 68d8dd386..36cd5f770 100644 --- a/enable/canvas.py +++ b/enable/canvas.py @@ -159,7 +159,7 @@ def _draw_underlay(self, gc, view_bounds=None, mode="default"): gc.move_to(x, 0) gc.line_to(x2, 0) gc.stroke_path() - super(Canvas, self)._draw_underlay(gc, view_bounds, mode) + super()._draw_underlay(gc, view_bounds, mode) def _transform_view_bounds(self, view_bounds): # Overload the parent class's implementation to skip visibility test diff --git a/enable/text_grid.py b/enable/text_grid.py index 6ee30b33f..178da541c 100644 --- a/enable/text_grid.py +++ b/enable/text_grid.py @@ -94,7 +94,7 @@ class TextGrid(Component): # ------------------------------------------------------------------------ def __init__(self, **kwtraits): - super(TextGrid, self).__init__(**kwtraits) + super().__init__(**kwtraits) self.selected_cells = [] # ------------------------------------------------------------------------