From 79114a9e36efc1d458905b1e67f9e0879155ab37 Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Fri, 16 Apr 2021 15:50:54 +0530 Subject: [PATCH 1/2] DEV : Import cbrewer as COLOR_PALETTE from chaco.api this was an autoamted search and replace --- examples/demo/advanced/javascript_hover_tools.py | 2 +- examples/demo/basic/grid_container.py | 2 +- examples/demo/basic/grid_container_aspect_ratio.py | 2 +- examples/demo/bigdata.py | 2 +- examples/demo/canvas/data_source_button.py | 2 +- examples/demo/data_labels.py | 2 +- examples/demo/edit_line.py | 2 +- examples/demo/financial/correlations.py | 2 +- examples/demo/multiaxis.py | 2 +- examples/demo/multiaxis_using_Plot.py | 2 +- examples/demo/noninteractive.py | 2 +- examples/demo/scales_test.py | 2 +- examples/demo/simple_line.py | 2 +- examples/demo/stacked_axis.py | 2 +- examples/demo/tornado.py | 2 +- examples/demo/vertical_plot.py | 2 +- examples/user_guide/grid_plot_container.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/demo/advanced/javascript_hover_tools.py b/examples/demo/advanced/javascript_hover_tools.py index 681be3ba8..62b4f418d 100644 --- a/examples/demo/advanced/javascript_hover_tools.py +++ b/examples/demo/advanced/javascript_hover_tools.py @@ -35,7 +35,7 @@ # Chaco imports from chaco.api import ArrayPlotData, Plot, PlotGraphicsContext, LinePlot -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # -- Constants ----------------------------------------------------------------- diff --git a/examples/demo/basic/grid_container.py b/examples/demo/basic/grid_container.py index c004d04ee..b8a19d55a 100644 --- a/examples/demo/basic/grid_container.py +++ b/examples/demo/basic/grid_container.py @@ -20,7 +20,7 @@ from numpy import linspace from scipy.special import jn -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # Enthought library imports from enable.api import Component, ComponentEditor diff --git a/examples/demo/basic/grid_container_aspect_ratio.py b/examples/demo/basic/grid_container_aspect_ratio.py index 2776e0a5c..d373e60bb 100644 --- a/examples/demo/basic/grid_container_aspect_ratio.py +++ b/examples/demo/basic/grid_container_aspect_ratio.py @@ -9,7 +9,7 @@ from numpy import linspace from scipy.special import jn -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # Enthought library imports from enable.api import Component, ComponentEditor diff --git a/examples/demo/bigdata.py b/examples/demo/bigdata.py index 2e0d09abc..a9dd6ece7 100644 --- a/examples/demo/bigdata.py +++ b/examples/demo/bigdata.py @@ -14,7 +14,7 @@ from scipy.special import jn from numpy import arange -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # Enthought library imports from enable.api import Component, ComponentEditor diff --git a/examples/demo/canvas/data_source_button.py b/examples/demo/canvas/data_source_button.py index 7b2a3e559..9f8df48c7 100644 --- a/examples/demo/canvas/data_source_button.py +++ b/examples/demo/canvas/data_source_button.py @@ -1,6 +1,6 @@ from random import choice from traits.api import Any, Enum, HasTraits, Instance, Int, List, Str -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE from chaco.api import Plot from chaco.plot_canvas_toolbar import PlotToolbarButton diff --git a/examples/demo/data_labels.py b/examples/demo/data_labels.py index 555fef1d7..6b408b9f2 100644 --- a/examples/demo/data_labels.py +++ b/examples/demo/data_labels.py @@ -32,7 +32,7 @@ OverlayPlotContainer, DataLabel, ) -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE from chaco.tools.api import PanTool, ZoomTool, DataLabelTool diff --git a/examples/demo/edit_line.py b/examples/demo/edit_line.py index b76359da4..50b39878a 100644 --- a/examples/demo/edit_line.py +++ b/examples/demo/edit_line.py @@ -18,7 +18,7 @@ from numpy import linspace from scipy.special import jn -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # Enthought library imports from enable.tools.api import DragTool diff --git a/examples/demo/financial/correlations.py b/examples/demo/financial/correlations.py index 6d525345c..a4c269375 100644 --- a/examples/demo/financial/correlations.py +++ b/examples/demo/financial/correlations.py @@ -20,7 +20,7 @@ from chaco.api import ArrayPlotData, Plot, PlotAxis, ScatterInspectorOverlay from chaco.scales.api import CalendarScaleSystem from chaco.scales_tick_generator import ScalesTickGenerator -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE from chaco.tools.api import ( PanTool, ZoomTool, diff --git a/examples/demo/multiaxis.py b/examples/demo/multiaxis.py index 74780fa23..1fcba69fa 100644 --- a/examples/demo/multiaxis.py +++ b/examples/demo/multiaxis.py @@ -15,7 +15,7 @@ from numpy import arange from scipy.special import jn -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # Enthought library imports from enable.api import Component, ComponentEditor diff --git a/examples/demo/multiaxis_using_Plot.py b/examples/demo/multiaxis_using_Plot.py index 313def22e..1ffad97ed 100644 --- a/examples/demo/multiaxis_using_Plot.py +++ b/examples/demo/multiaxis_using_Plot.py @@ -13,7 +13,7 @@ from numpy import linspace from scipy.special import jn -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # Enthought library imports from enable.api import Component, ComponentEditor diff --git a/examples/demo/noninteractive.py b/examples/demo/noninteractive.py index a78ad98ee..02644fd5d 100644 --- a/examples/demo/noninteractive.py +++ b/examples/demo/noninteractive.py @@ -18,7 +18,7 @@ # Chaco imports from chaco.api import ArrayPlotData, Plot, PlotGraphicsContext -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE DPI = 72.0 diff --git a/examples/demo/scales_test.py b/examples/demo/scales_test.py index ac6cd8f20..70a05119a 100644 --- a/examples/demo/scales_test.py +++ b/examples/demo/scales_test.py @@ -21,7 +21,7 @@ from scipy.special import jn from time import time -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # Enthought library imports from enable.api import Component, ComponentEditor diff --git a/examples/demo/simple_line.py b/examples/demo/simple_line.py index 3d146cbf6..b85dffc6e 100644 --- a/examples/demo/simple_line.py +++ b/examples/demo/simple_line.py @@ -36,7 +36,7 @@ Legend, ) from chaco.tools.api import PanTool, ZoomTool, LegendTool, TraitsTool, DragZoom -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE class OverlappingPlotContainer(OverlayPlotContainer): diff --git a/examples/demo/stacked_axis.py b/examples/demo/stacked_axis.py index 0f51c7bbc..308fe9504 100644 --- a/examples/demo/stacked_axis.py +++ b/examples/demo/stacked_axis.py @@ -10,7 +10,7 @@ from numpy import linspace from scipy.special import jn -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # Enthought library imports from enable.api import Component, ComponentEditor diff --git a/examples/demo/tornado.py b/examples/demo/tornado.py index e296f1e6a..51ecdacbe 100644 --- a/examples/demo/tornado.py +++ b/examples/demo/tornado.py @@ -18,7 +18,7 @@ OverlayPlotContainer, PlotAxis, ) -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE class PlotExample(HasTraits): diff --git a/examples/demo/vertical_plot.py b/examples/demo/vertical_plot.py index c6ff1d1c2..272a73c9d 100644 --- a/examples/demo/vertical_plot.py +++ b/examples/demo/vertical_plot.py @@ -11,7 +11,7 @@ from numpy import arange from scipy.special import jn -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE # Enthought library imports from enable.api import Component, ComponentEditor diff --git a/examples/user_guide/grid_plot_container.py b/examples/user_guide/grid_plot_container.py index f49c68e5d..f7828d7e5 100644 --- a/examples/user_guide/grid_plot_container.py +++ b/examples/user_guide/grid_plot_container.py @@ -2,7 +2,7 @@ from scipy.special import jn from chaco.api import ArrayPlotData, Plot, GridPlotContainer -from chaco.example_support import COLOR_PALETTE +from chaco.api import cbrewer as COLOR_PALETTE from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View From 0e5109bee568fe60ea889245a6b881981e93e2b6 Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Fri, 16 Apr 2021 15:58:15 +0530 Subject: [PATCH 2/2] CLN : Merge the new api import into existing api imports --- examples/demo/advanced/javascript_hover_tools.py | 9 +++++++-- examples/demo/basic/grid_container.py | 6 +++--- examples/demo/basic/grid_container_aspect_ratio.py | 6 +++--- examples/demo/bigdata.py | 3 +-- examples/demo/canvas/data_source_button.py | 3 +-- examples/demo/data_labels.py | 2 +- examples/demo/edit_line.py | 7 +++---- examples/demo/financial/correlations.py | 9 +++++++-- examples/demo/multiaxis.py | 3 +-- examples/demo/multiaxis_using_Plot.py | 11 +++++++---- examples/demo/noninteractive.py | 5 +++-- examples/demo/scales_test.py | 3 +-- examples/demo/simple_line.py | 2 +- examples/demo/stacked_axis.py | 12 ++++++++---- examples/demo/tornado.py | 2 +- examples/demo/vertical_plot.py | 3 +-- examples/user_guide/grid_plot_container.py | 5 +++-- 17 files changed, 52 insertions(+), 39 deletions(-) diff --git a/examples/demo/advanced/javascript_hover_tools.py b/examples/demo/advanced/javascript_hover_tools.py index 62b4f418d..6b79c781a 100644 --- a/examples/demo/advanced/javascript_hover_tools.py +++ b/examples/demo/advanced/javascript_hover_tools.py @@ -34,8 +34,13 @@ from scipy.special import jn # Chaco imports -from chaco.api import ArrayPlotData, Plot, PlotGraphicsContext, LinePlot -from chaco.api import cbrewer as COLOR_PALETTE +from chaco.api import ( + ArrayPlotData, + Plot, + PlotGraphicsContext, + LinePlot, + cbrewer as COLOR_PALETTE, +) # -- Constants ----------------------------------------------------------------- diff --git a/examples/demo/basic/grid_container.py b/examples/demo/basic/grid_container.py index b8a19d55a..670afe69f 100644 --- a/examples/demo/basic/grid_container.py +++ b/examples/demo/basic/grid_container.py @@ -20,15 +20,15 @@ from numpy import linspace from scipy.special import jn -from chaco.api import cbrewer as COLOR_PALETTE - # Enthought library imports from enable.api import Component, ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, Group, View # Chaco imports -from chaco.api import ArrayPlotData, GridContainer, Plot, PlotLabel +from chaco.api import ( + ArrayPlotData, GridContainer, Plot, PlotLabel, cbrewer as COLOR_PALETTE, +) from chaco.tools.api import PanTool, ZoomTool diff --git a/examples/demo/basic/grid_container_aspect_ratio.py b/examples/demo/basic/grid_container_aspect_ratio.py index d373e60bb..1300965a7 100644 --- a/examples/demo/basic/grid_container_aspect_ratio.py +++ b/examples/demo/basic/grid_container_aspect_ratio.py @@ -9,15 +9,15 @@ from numpy import linspace from scipy.special import jn -from chaco.api import cbrewer as COLOR_PALETTE - # Enthought library imports from enable.api import Component, ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, Group, View # Chaco imports -from chaco.api import ArrayPlotData, GridContainer, Plot +from chaco.api import ( + ArrayPlotData, GridContainer, Plot, cbrewer as COLOR_PALETTE, +) from chaco.tools.api import PanTool, ZoomTool diff --git a/examples/demo/bigdata.py b/examples/demo/bigdata.py index a9dd6ece7..6665c8a17 100644 --- a/examples/demo/bigdata.py +++ b/examples/demo/bigdata.py @@ -14,8 +14,6 @@ from scipy.special import jn from numpy import arange -from chaco.api import cbrewer as COLOR_PALETTE - # Enthought library imports from enable.api import Component, ComponentEditor from traits.api import Bool, HasTraits, Instance @@ -24,6 +22,7 @@ # Chaco imports from chaco.api import ( OverlayPlotContainer, + cbrewer as COLOR_PALETTE, create_line_plot, add_default_axes, add_default_grids, diff --git a/examples/demo/canvas/data_source_button.py b/examples/demo/canvas/data_source_button.py index 9f8df48c7..ef6ccf983 100644 --- a/examples/demo/canvas/data_source_button.py +++ b/examples/demo/canvas/data_source_button.py @@ -1,7 +1,6 @@ from random import choice from traits.api import Any, Enum, HasTraits, Instance, Int, List, Str -from chaco.api import cbrewer as COLOR_PALETTE -from chaco.api import Plot +from chaco.api import Plot, cbrewer as COLOR_PALETTE from chaco.plot_canvas_toolbar import PlotToolbarButton DEBUG = False diff --git a/examples/demo/data_labels.py b/examples/demo/data_labels.py index 6b408b9f2..213281b03 100644 --- a/examples/demo/data_labels.py +++ b/examples/demo/data_labels.py @@ -26,13 +26,13 @@ # Chaco imports from chaco.api import ( + cbrewer as COLOR_PALETTE, create_line_plot, add_default_axes, add_default_grids, OverlayPlotContainer, DataLabel, ) -from chaco.api import cbrewer as COLOR_PALETTE from chaco.tools.api import PanTool, ZoomTool, DataLabelTool diff --git a/examples/demo/edit_line.py b/examples/demo/edit_line.py index 50b39878a..a88787ff3 100644 --- a/examples/demo/edit_line.py +++ b/examples/demo/edit_line.py @@ -18,11 +18,9 @@ from numpy import linspace from scipy.special import jn -from chaco.api import cbrewer as COLOR_PALETTE - # Enthought library imports -from enable.tools.api import DragTool from enable.api import Component, ComponentEditor +from enable.tools.api import DragTool from traits.api import HasTraits, Instance, Int, Tuple from traitsui.api import UItem, View @@ -30,10 +28,11 @@ from chaco.api import ( add_default_axes, add_default_grids, + cbrewer as COLOR_PALETTE, + create_line_plot, OverlayPlotContainer, PlotLabel, ScatterPlot, - create_line_plot, ) from chaco.tools.api import PanTool, ZoomTool diff --git a/examples/demo/financial/correlations.py b/examples/demo/financial/correlations.py index a4c269375..9562bc17f 100644 --- a/examples/demo/financial/correlations.py +++ b/examples/demo/financial/correlations.py @@ -17,10 +17,15 @@ from traitsui.api import Item, View, HSplit, VGroup, EnumEditor # Chaco imports -from chaco.api import ArrayPlotData, Plot, PlotAxis, ScatterInspectorOverlay +from chaco.api import ( + ArrayPlotData, + Plot, + PlotAxis, + ScatterInspectorOverlay, + cbrewer as COLOR_PALETTE, +) from chaco.scales.api import CalendarScaleSystem from chaco.scales_tick_generator import ScalesTickGenerator -from chaco.api import cbrewer as COLOR_PALETTE from chaco.tools.api import ( PanTool, ZoomTool, diff --git a/examples/demo/multiaxis.py b/examples/demo/multiaxis.py index 1fcba69fa..9c53b000b 100644 --- a/examples/demo/multiaxis.py +++ b/examples/demo/multiaxis.py @@ -15,8 +15,6 @@ from numpy import arange from scipy.special import jn -from chaco.api import cbrewer as COLOR_PALETTE - # Enthought library imports from enable.api import Component, ComponentEditor from traits.api import HasTraits, Instance @@ -24,6 +22,7 @@ # Chaco imports from chaco.api import ( + cbrewer as COLOR_PALETTE, create_line_plot, add_default_axes, add_default_grids, diff --git a/examples/demo/multiaxis_using_Plot.py b/examples/demo/multiaxis_using_Plot.py index 1ffad97ed..a913f677c 100644 --- a/examples/demo/multiaxis_using_Plot.py +++ b/examples/demo/multiaxis_using_Plot.py @@ -13,17 +13,20 @@ from numpy import linspace from scipy.special import jn -from chaco.api import cbrewer as COLOR_PALETTE - # Enthought library imports from enable.api import Component, ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, Group, View # Chaco imports -from chaco.api import ArrayPlotData, Plot +from chaco.api import ( + add_default_axes, + ArrayPlotData, + cbrewer as COLOR_PALETTE, + create_line_plot, + Plot, +) from chaco.tools.api import BroadcasterTool, PanTool, ZoomTool -from chaco.api import create_line_plot, add_default_axes # =============================================================================== # # Create the Chaco plot. diff --git a/examples/demo/noninteractive.py b/examples/demo/noninteractive.py index 02644fd5d..b86f1c4f4 100644 --- a/examples/demo/noninteractive.py +++ b/examples/demo/noninteractive.py @@ -17,8 +17,9 @@ from traits.etsconfig.api import ETSConfig # Chaco imports -from chaco.api import ArrayPlotData, Plot, PlotGraphicsContext -from chaco.api import cbrewer as COLOR_PALETTE +from chaco.api import ( + ArrayPlotData, Plot, PlotGraphicsContext, cbrewer as COLOR_PALETTE, +) DPI = 72.0 diff --git a/examples/demo/scales_test.py b/examples/demo/scales_test.py index 70a05119a..86d283c49 100644 --- a/examples/demo/scales_test.py +++ b/examples/demo/scales_test.py @@ -21,8 +21,6 @@ from scipy.special import jn from time import time -from chaco.api import cbrewer as COLOR_PALETTE - # Enthought library imports from enable.api import Component, ComponentEditor from traits.api import HasTraits, Instance @@ -33,6 +31,7 @@ create_line_plot, OverlayPlotContainer, PlotLabel, + cbrewer as COLOR_PALETTE, create_scatter_plot, Legend, PlotGrid, diff --git a/examples/demo/simple_line.py b/examples/demo/simple_line.py index b85dffc6e..5ce7308c9 100644 --- a/examples/demo/simple_line.py +++ b/examples/demo/simple_line.py @@ -32,11 +32,11 @@ add_default_grids, OverlayPlotContainer, PlotLabel, + cbrewer as COLOR_PALETTE, create_scatter_plot, Legend, ) from chaco.tools.api import PanTool, ZoomTool, LegendTool, TraitsTool, DragZoom -from chaco.api import cbrewer as COLOR_PALETTE class OverlappingPlotContainer(OverlayPlotContainer): diff --git a/examples/demo/stacked_axis.py b/examples/demo/stacked_axis.py index 308fe9504..85a368450 100644 --- a/examples/demo/stacked_axis.py +++ b/examples/demo/stacked_axis.py @@ -10,17 +10,21 @@ from numpy import linspace from scipy.special import jn -from chaco.api import cbrewer as COLOR_PALETTE - # Enthought library imports from enable.api import Component, ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, Group, View # Chaco imports -from chaco.api import HPlotContainer, OverlayPlotContainer, PlotAxis, PlotGrid +from chaco.api import ( + HPlotContainer, + OverlayPlotContainer, + PlotAxis, + PlotGrid, + cbrewer as COLOR_PALETTE, + create_line_plot, +) from chaco.tools.api import BroadcasterTool, PanTool -from chaco.api import create_line_plot # =============================================================================== # # Create the Chaco plot. diff --git a/examples/demo/tornado.py b/examples/demo/tornado.py index 51ecdacbe..91f7c651a 100644 --- a/examples/demo/tornado.py +++ b/examples/demo/tornado.py @@ -17,8 +17,8 @@ LinearMapper, OverlayPlotContainer, PlotAxis, + cbrewer as COLOR_PALETTE, ) -from chaco.api import cbrewer as COLOR_PALETTE class PlotExample(HasTraits): diff --git a/examples/demo/vertical_plot.py b/examples/demo/vertical_plot.py index 272a73c9d..f1a88b594 100644 --- a/examples/demo/vertical_plot.py +++ b/examples/demo/vertical_plot.py @@ -11,8 +11,6 @@ from numpy import arange from scipy.special import jn -from chaco.api import cbrewer as COLOR_PALETTE - # Enthought library imports from enable.api import Component, ComponentEditor from traits.api import HasTraits, Instance @@ -21,6 +19,7 @@ PlotLabel, VPlotContainer, HPlotContainer, + cbrewer as COLOR_PALETTE, create_line_plot, ) diff --git a/examples/user_guide/grid_plot_container.py b/examples/user_guide/grid_plot_container.py index f7828d7e5..52efab0bf 100644 --- a/examples/user_guide/grid_plot_container.py +++ b/examples/user_guide/grid_plot_container.py @@ -1,8 +1,9 @@ from numpy import linspace from scipy.special import jn -from chaco.api import ArrayPlotData, Plot, GridPlotContainer -from chaco.api import cbrewer as COLOR_PALETTE +from chaco.api import ( + ArrayPlotData, Plot, GridPlotContainer, cbrewer as COLOR_PALETTE, +) from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View