From 3a57ebbe379c7a0e733eccbfc598ee5fe3fd70bd Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Mon, 12 Apr 2021 16:25:03 +0530 Subject: [PATCH] DEV : Use api modules for ETS packages where possible --- chaco/chaco_plot_editor.py | 3 +- chaco/data_view.py | 2 +- chaco/plugin/plot_editor.py | 2 +- chaco/tests/test_arraydatasource.py | 2 +- chaco/tests/test_function_data_source.py | 2 +- chaco/tests/test_grid_data_source.py | 2 +- chaco/tests/test_image_data.py | 2 +- chaco/tests/test_line_scatterplot.py | 2 +- chaco/tests/test_multi_array_data_source.py | 2 +- chaco/tests/test_scatterplot_1d.py | 2 +- chaco/tests/test_text_plot_1d.py | 2 +- chaco/tests_with_backend/test_2d_case.py | 2 +- .../tests_with_backend/test_highlight_tool.py | 2 +- chaco/tools/api.py | 2 +- chaco/tools/cursor_tool.py | 2 +- chaco/tools/data_label_tool.py | 2 +- chaco/tools/drag_tool.py | 2 +- chaco/tools/drag_zoom.py | 2 +- chaco/tools/legend_tool.py | 2 +- chaco/tools/move_tool.py | 2 +- chaco/tools/pan_tool2.py | 2 +- chaco/tools/tests/test_image_inspector.py | 2 +- chaco/tools/tests/test_scatter_inspector.py | 2 +- chaco/ui/plot_window.py | 2 +- .../scalar_image_function_inspector.py | 2 +- .../scalar_image_function_inspector_old.py | 10 +++- examples/demo/basic/image_from_file.py | 8 ++- examples/demo/basic/tabbed_plots.py | 2 +- examples/demo/chaco_trait_editor.py | 5 +- examples/demo/cursor_tool_demo.py | 2 +- examples/demo/depth.py | 2 +- examples/demo/financial/correlations.py | 2 +- examples/demo/status_overlay.py | 2 +- examples/demo/world_map.py | 2 +- examples/demo/xray_plot.py | 4 +- .../scipy2008/connected_orientation.py | 2 +- .../tutorials/scipy2008/connected_range.py | 2 +- .../scipy2008/connected_single_range.py | 2 +- .../tutorials/scipy2008/connected_widgets.py | 2 +- examples/tutorials/scipy2008/container.py | 2 +- .../tutorials/scipy2008/container_nospace.py | 2 +- .../tutorials/scipy2008/container_vertical.py | 2 +- .../tutorials/scipy2008/custom_overlay.py | 3 +- .../scipy2008/custom_overlay_dataspace.py | 3 +- .../scipy2008/custom_overlay_movetool.py | 3 +- examples/tutorials/scipy2008/custom_tool.py | 3 +- .../tutorials/scipy2008/custom_tool_click.py | 3 +- .../tutorials/scipy2008/custom_tool_screen.py | 3 +- examples/tutorials/scipy2008/data_chooser.py | 2 +- examples/tutorials/scipy2008/first_plot.py | 2 +- examples/tutorials/scipy2008/image.py | 2 +- examples/tutorials/scipy2008/overlapping.py | 2 +- examples/tutorials/scipy2008/ploteditor.py | 2 +- examples/tutorials/scipy2008/scatter.py | 2 +- examples/tutorials/scipy2008/tool_chooser.py | 2 +- examples/tutorials/scipy2008/tools.py | 2 +- .../tutorials/scipy2008/traits_example.py | 2 +- examples/tutorials/scipy2008/traits_image.py | 2 +- examples/user_guide/grid_plot_container.py | 4 +- examples/user_guide/h_plot_container.py | 2 +- .../h_plot_container_add_multiple_times.py | 2 +- .../user_guide/h_plot_container_colorbar.py | 2 +- .../user_guide/overlay_container_inset.py | 4 +- .../plot_types/create_plot_snapshots.py | 57 ++++++++++--------- examples/user_guide/plot_types/plot_window.py | 5 +- 65 files changed, 107 insertions(+), 111 deletions(-) diff --git a/chaco/chaco_plot_editor.py b/chaco/chaco_plot_editor.py index 64a8b0ada..e7998c760 100644 --- a/chaco/chaco_plot_editor.py +++ b/chaco/chaco_plot_editor.py @@ -15,8 +15,7 @@ from enable.trait_defs.ui.api import RGBAColorEditor from kiva.trait_defs.kiva_font_trait import KivaFont from traits.api import Enum, Str, Range, Tuple, Bool, Trait, Int, Any, Property -from traitsui.api import Item -from traitsui.editor_factory import EditorFactory +from traitsui.api import EditorFactory, Item # Toolkit dependent imports from traitsui.toolkit import toolkit_object diff --git a/chaco/data_view.py b/chaco/data_view.py index 4c5525685..5bba1a8d3 100644 --- a/chaco/data_view.py +++ b/chaco/data_view.py @@ -4,7 +4,7 @@ from numpy import array, transpose from traits.api import Bool, Enum, Instance, Property -from enable.colors import color_table +from enable.api import color_table from .abstract_overlay import AbstractOverlay from .axis import PlotAxis diff --git a/chaco/plugin/plot_editor.py b/chaco/plugin/plot_editor.py index 71c3836c0..e72ac1685 100644 --- a/chaco/plugin/plot_editor.py +++ b/chaco/plugin/plot_editor.py @@ -1,5 +1,5 @@ from chaco.shell.scaly_plot import ScalyPlot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from pyface.workbench.api import TraitsUIEditor from traits.api import Any, Enum, HasTraits, Property, Str from traitsui.api import Item, View diff --git a/chaco/tests/test_arraydatasource.py b/chaco/tests/test_arraydatasource.py index 02c4df286..ef25f2ce8 100644 --- a/chaco/tests/test_arraydatasource.py +++ b/chaco/tests/test_arraydatasource.py @@ -11,7 +11,7 @@ import numpy as np from chaco.api import ArrayDataSource, PointDataSource -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools class ArrayDataSourceTestCase(UnittestTools, unittest.TestCase): diff --git a/chaco/tests/test_function_data_source.py b/chaco/tests/test_function_data_source.py index ae73c8c2b..ab5b60da5 100644 --- a/chaco/tests/test_function_data_source.py +++ b/chaco/tests/test_function_data_source.py @@ -9,7 +9,7 @@ from chaco.api import DataRange1D from chaco.function_data_source import FunctionDataSource -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools class FunctionDataSourceTestCase(UnittestTools, unittest.TestCase): diff --git a/chaco/tests/test_grid_data_source.py b/chaco/tests/test_grid_data_source.py index 698f45174..fcf426796 100644 --- a/chaco/tests/test_grid_data_source.py +++ b/chaco/tests/test_grid_data_source.py @@ -8,7 +8,7 @@ from numpy.testing import assert_array_equal from chaco.api import GridDataSource -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools class GridDataSourceTestCase(UnittestTools, unittest.TestCase): diff --git a/chaco/tests/test_image_data.py b/chaco/tests/test_image_data.py index bb2940a7d..faf65d74e 100644 --- a/chaco/tests/test_image_data.py +++ b/chaco/tests/test_image_data.py @@ -10,7 +10,7 @@ from pkg_resources import resource_filename from chaco.api import ImageData -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools data_dir = resource_filename("chaco.tests", "data") diff --git a/chaco/tests/test_line_scatterplot.py b/chaco/tests/test_line_scatterplot.py index 58aa5b8b0..b28d942f8 100644 --- a/chaco/tests/test_line_scatterplot.py +++ b/chaco/tests/test_line_scatterplot.py @@ -3,7 +3,7 @@ from numpy import alltrue, arange, array from numpy.testing import assert_almost_equal -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools # Chaco imports from chaco.api import ( diff --git a/chaco/tests/test_multi_array_data_source.py b/chaco/tests/test_multi_array_data_source.py index 854309ae2..2933fd5ff 100644 --- a/chaco/tests/test_multi_array_data_source.py +++ b/chaco/tests/test_multi_array_data_source.py @@ -8,7 +8,7 @@ from numpy.testing import assert_array_equal from chaco.api import MultiArrayDataSource -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools class MultiArrayDataTestCase(UnittestTools, unittest.TestCase): diff --git a/chaco/tests/test_scatterplot_1d.py b/chaco/tests/test_scatterplot_1d.py index a94efa271..7b8be7b41 100644 --- a/chaco/tests/test_scatterplot_1d.py +++ b/chaco/tests/test_scatterplot_1d.py @@ -4,7 +4,7 @@ from numpy.testing import assert_almost_equal from enable.compiled_path import CompiledPath -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools # Chaco imports from chaco.api import ( diff --git a/chaco/tests/test_text_plot_1d.py b/chaco/tests/test_text_plot_1d.py index 2d07b8156..780d79093 100644 --- a/chaco/tests/test_text_plot_1d.py +++ b/chaco/tests/test_text_plot_1d.py @@ -3,7 +3,7 @@ from numpy import alltrue, arange, array from numpy.testing import assert_almost_equal -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools # Chaco imports from chaco.api import ( diff --git a/chaco/tests_with_backend/test_2d_case.py b/chaco/tests_with_backend/test_2d_case.py index f90c629a1..aba4b97d3 100644 --- a/chaco/tests_with_backend/test_2d_case.py +++ b/chaco/tests_with_backend/test_2d_case.py @@ -4,7 +4,7 @@ from traits.api import HasTraits, Instance from traits.etsconfig.api import ETSConfig -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traitsui.api import Item, View import numpy as np diff --git a/chaco/tests_with_backend/test_highlight_tool.py b/chaco/tests_with_backend/test_highlight_tool.py index 8de1c8c5f..d84bcdcc9 100644 --- a/chaco/tests_with_backend/test_highlight_tool.py +++ b/chaco/tests_with_backend/test_highlight_tool.py @@ -3,7 +3,7 @@ from traits.api import HasTraits, Instance from traits.etsconfig.api import ETSConfig from traitsui.api import Item, View -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from chaco.api import Plot, ArrayPlotData from chaco.tools.highlight_tool import HighlightTool diff --git a/chaco/tools/api.py b/chaco/tools/api.py index 5ec166c43..41b1ad325 100644 --- a/chaco/tools/api.py +++ b/chaco/tools/api.py @@ -3,7 +3,7 @@ from .broadcaster import BroadcasterTool from .dataprinter import DataPrinter from .data_label_tool import DataLabelTool -from enable.tools.drag_tool import DragTool +from enable.tools.api import DragTool from .draw_points_tool import DrawPointsTool from .drag_zoom import DragZoom from .highlight_tool import HighlightTool diff --git a/chaco/tools/cursor_tool.py b/chaco/tools/cursor_tool.py index ed6be2b33..09c0eaa1c 100644 --- a/chaco/tools/cursor_tool.py +++ b/chaco/tools/cursor_tool.py @@ -19,7 +19,7 @@ import numpy # Enthought library imports -from enable.tools.drag_tool import DragTool +from enable.tools.api import DragTool from traits.api import ( Int, Property, diff --git a/chaco/tools/data_label_tool.py b/chaco/tools/data_label_tool.py index 3cd5326b6..dabf0242f 100644 --- a/chaco/tools/data_label_tool.py +++ b/chaco/tools/data_label_tool.py @@ -5,7 +5,7 @@ # Enthought library imports from traits.api import Any, Bool, Enum -from enable.tools.drag_tool import DragTool +from enable.tools.api import DragTool class DataLabelTool(DragTool): diff --git a/chaco/tools/drag_tool.py b/chaco/tools/drag_tool.py index 2d71835e7..b93b69eaa 100644 --- a/chaco/tools/drag_tool.py +++ b/chaco/tools/drag_tool.py @@ -10,4 +10,4 @@ DeprecationWarning, ) -from enable.tools.drag_tool import DragTool +from enable.tools.api import DragTool diff --git a/chaco/tools/drag_zoom.py b/chaco/tools/drag_zoom.py index a2d94372e..00ec18c5a 100644 --- a/chaco/tools/drag_zoom.py +++ b/chaco/tools/drag_zoom.py @@ -2,7 +2,7 @@ """ # Enthought library imports -from enable.tools.drag_tool import DragTool +from enable.tools.api import DragTool from traits.api import Bool, Enum, Float, Tuple # Chaco imports diff --git a/chaco/tools/legend_tool.py b/chaco/tools/legend_tool.py index dc0acee55..294f372ca 100644 --- a/chaco/tools/legend_tool.py +++ b/chaco/tools/legend_tool.py @@ -3,7 +3,7 @@ # Enthought library imports from traits.api import Bool, Enum -from enable.tools.drag_tool import DragTool +from enable.tools.api import DragTool class LegendTool(DragTool): diff --git a/chaco/tools/move_tool.py b/chaco/tools/move_tool.py index ba97184c0..bb0e0e377 100644 --- a/chaco/tools/move_tool.py +++ b/chaco/tools/move_tool.py @@ -2,7 +2,7 @@ """ # Enthought library imports from traits.api import Tuple -from enable.tools.drag_tool import DragTool +from enable.tools.api import DragTool class MoveTool(DragTool): diff --git a/chaco/tools/pan_tool2.py b/chaco/tools/pan_tool2.py index 4f92c5ca0..fd6c601a1 100644 --- a/chaco/tools/pan_tool2.py +++ b/chaco/tools/pan_tool2.py @@ -1,7 +1,7 @@ from numpy import inf from enable.api import Pointer -from enable.tools.drag_tool import DragTool +from enable.tools.api import DragTool from traits.api import Bool, Enum, Float, Tuple diff --git a/chaco/tools/tests/test_image_inspector.py b/chaco/tools/tests/test_image_inspector.py index 5df6ce75f..64cb7d9ed 100644 --- a/chaco/tools/tests/test_image_inspector.py +++ b/chaco/tools/tests/test_image_inspector.py @@ -8,7 +8,7 @@ from chaco.api import ArrayPlotData, Plot from chaco.tools.api import ImageInspectorTool, ImageInspectorOverlay from enable.testing import EnableTestAssistant -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools def create_image_plot(img_values, **kwargs): diff --git a/chaco/tools/tests/test_scatter_inspector.py b/chaco/tools/tests/test_scatter_inspector.py index e3ef01f86..e9b860235 100644 --- a/chaco/tools/tests/test_scatter_inspector.py +++ b/chaco/tools/tests/test_scatter_inspector.py @@ -7,7 +7,7 @@ from chaco.api import create_scatter_plot from chaco.tools.api import ScatterInspector from enable.testing import EnableTestAssistant -from traits.testing.unittest_tools import UnittestTools +from traits.testing.api import UnittestTools class TestScatterInspectorTool(EnableTestAssistant, TestCase, UnittestTools): diff --git a/chaco/ui/plot_window.py b/chaco/ui/plot_window.py index 6c41bfb7b..4671e676d 100644 --- a/chaco/ui/plot_window.py +++ b/chaco/ui/plot_window.py @@ -2,7 +2,7 @@ from traits.api import Instance, HasTraits from traitsui.api import View, Item from enable.api import Container -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor class PlotWindow(HasTraits): diff --git a/examples/demo/advanced/scalar_image_function_inspector.py b/examples/demo/advanced/scalar_image_function_inspector.py index 1d1a47e2f..61a00cbc4 100644 --- a/examples/demo/advanced/scalar_image_function_inspector.py +++ b/examples/demo/advanced/scalar_image_function_inspector.py @@ -38,7 +38,7 @@ PlotAxis, ) from chaco import default_colormaps -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from chaco.tools.api import LineInspector, PanTool, ZoomTool from traits.api import ( Array, diff --git a/examples/demo/advanced/scalar_image_function_inspector_old.py b/examples/demo/advanced/scalar_image_function_inspector_old.py index 660d682b4..ce4d178b6 100644 --- a/examples/demo/advanced/scalar_image_function_inspector_old.py +++ b/examples/demo/advanced/scalar_image_function_inspector_old.py @@ -33,7 +33,7 @@ PlotAxis, ) from chaco.default_colormaps import * -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from chaco.tools.api import ( LineInspector, PanTool, @@ -58,14 +58,18 @@ Trait, observe, ) -from traitsui.api import Group, Handler, HGroup, Item, View -from traitsui.menu import ( +from traitsui.api import ( Action, CloseAction, + Group, + Handler, + HGroup, + Item, Menu, MenuBar, NoButtons, Separator, + View, ) diff --git a/examples/demo/basic/image_from_file.py b/examples/demo/basic/image_from_file.py index 7e187b614..856a4bf11 100644 --- a/examples/demo/basic/image_from_file.py +++ b/examples/demo/basic/image_from_file.py @@ -17,19 +17,21 @@ # Enthought library imports from traits.util.resource import find_resource from traits.api import File, HasTraits, Instance -from traitsui.api import Handler, Item, View -from traitsui.menu import ( +from traitsui.api import ( Action, CloseAction, + Handler, + Item, Menu, MenuBar, OKCancelButtons, Separator, + View, ) # Chaco imports from chaco.api import ArrayPlotData, ImageData, Plot, PlotGraphicsContext -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from chaco.tools.api import PanTool, ZoomTool diff --git a/examples/demo/basic/tabbed_plots.py b/examples/demo/basic/tabbed_plots.py index a0ead7e05..d7856bdc4 100644 --- a/examples/demo/basic/tabbed_plots.py +++ b/examples/demo/basic/tabbed_plots.py @@ -25,7 +25,7 @@ from chaco.api import Plot, AbstractPlotData, ArrayPlotData from chaco.tools.api import PanTool, ZoomTool -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor class TabbedPlots(HasTraits): diff --git a/examples/demo/chaco_trait_editor.py b/examples/demo/chaco_trait_editor.py index ba52f376a..35c73a712 100644 --- a/examples/demo/chaco_trait_editor.py +++ b/examples/demo/chaco_trait_editor.py @@ -11,10 +11,9 @@ else: from traitsui.qt4.editor import Editor -from traitsui.editor_factory import EditorFactory +from traitsui.api import EditorFactory -from enable.window import Window -from enable.api import ColorTrait +from enable.api import ColorTrait, Window from chaco.api import OverlayPlotContainer, create_line_plot, LinePlot from chaco.tools.api import RangeSelection, RangeSelectionOverlay diff --git a/examples/demo/cursor_tool_demo.py b/examples/demo/cursor_tool_demo.py index 79ae5ef2e..f39ffc856 100644 --- a/examples/demo/cursor_tool_demo.py +++ b/examples/demo/cursor_tool_demo.py @@ -23,7 +23,7 @@ ) from chaco.tools.api import PanTool, ZoomTool from chaco.tools.cursor_tool import CursorTool, BaseCursorTool -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance, DelegatesTo from traitsui.api import View, Item, HGroup, VGroup diff --git a/examples/demo/depth.py b/examples/demo/depth.py index 358e209a2..1bda79dee 100644 --- a/examples/demo/depth.py +++ b/examples/demo/depth.py @@ -5,7 +5,7 @@ import numpy from chaco.api import ToolbarPlot, ArrayPlotData from chaco.tools.api import LineInspector -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import UItem, View diff --git a/examples/demo/financial/correlations.py b/examples/demo/financial/correlations.py index d134846d8..6d525345c 100644 --- a/examples/demo/financial/correlations.py +++ b/examples/demo/financial/correlations.py @@ -2,7 +2,7 @@ import time # ETS imports (non-chaco) -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import ( HasTraits, Instance, diff --git a/examples/demo/status_overlay.py b/examples/demo/status_overlay.py index 02f7d5a87..6c62b0826 100644 --- a/examples/demo/status_overlay.py +++ b/examples/demo/status_overlay.py @@ -5,7 +5,7 @@ from chaco.api import Plot, ArrayPlotData from chaco.layers.api import ErrorLayer, WarningLayer, StatusLayer -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance, Button from traitsui.api import UItem, View, HGroup diff --git a/examples/demo/world_map.py b/examples/demo/world_map.py index 783e293e6..e293f7e7e 100644 --- a/examples/demo/world_map.py +++ b/examples/demo/world_map.py @@ -20,7 +20,7 @@ # ETS imports from chaco.api import Plot, ArrayPlotData, ImageData from chaco.tools.api import ZoomTool -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance, Str from traitsui.api import Item, View diff --git a/examples/demo/xray_plot.py b/examples/demo/xray_plot.py index d31f7fe14..23e58b306 100644 --- a/examples/demo/xray_plot.py +++ b/examples/demo/xray_plot.py @@ -9,8 +9,8 @@ from traitsui.api import View, Item from enable.api import ComponentEditor from chaco.api import Plot, ArrayPlotData, AbstractOverlay -from enable.api import BaseTool -from enable.markers import DOT_MARKER, DotMarker +from enable.api import BaseTool, DotMarker +from kiva.api import DOT_MARKER class BoxSelectTool(BaseTool): diff --git a/examples/tutorials/scipy2008/connected_orientation.py b/examples/tutorials/scipy2008/connected_orientation.py index d5356029d..e04b02078 100644 --- a/examples/tutorials/scipy2008/connected_orientation.py +++ b/examples/tutorials/scipy2008/connected_orientation.py @@ -2,7 +2,7 @@ from chaco.api import ArrayPlotData, HPlotContainer, Plot from chaco.tools.api import PanTool, ZoomTool -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/connected_range.py b/examples/tutorials/scipy2008/connected_range.py index 0a88d3256..82f70af43 100644 --- a/examples/tutorials/scipy2008/connected_range.py +++ b/examples/tutorials/scipy2008/connected_range.py @@ -2,7 +2,7 @@ from chaco.api import ArrayPlotData, HPlotContainer, Plot from chaco.tools.api import PanTool, ZoomTool -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/connected_single_range.py b/examples/tutorials/scipy2008/connected_single_range.py index aef3d16d8..d9f7c652e 100644 --- a/examples/tutorials/scipy2008/connected_single_range.py +++ b/examples/tutorials/scipy2008/connected_single_range.py @@ -2,7 +2,7 @@ from chaco.api import ArrayPlotData, HPlotContainer, Plot from chaco.tools.api import PanTool, ZoomTool -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/connected_widgets.py b/examples/tutorials/scipy2008/connected_widgets.py index 83be676eb..b0b65548f 100644 --- a/examples/tutorials/scipy2008/connected_widgets.py +++ b/examples/tutorials/scipy2008/connected_widgets.py @@ -2,7 +2,7 @@ from chaco.api import ArrayPlotData, Plot from chaco.tools.api import PanTool, ZoomTool -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import Enum, HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/container.py b/examples/tutorials/scipy2008/container.py index 6ee0e0b66..e4944d1b4 100644 --- a/examples/tutorials/scipy2008/container.py +++ b/examples/tutorials/scipy2008/container.py @@ -1,7 +1,7 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, HPlotContainer, Plot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/container_nospace.py b/examples/tutorials/scipy2008/container_nospace.py index 46cba397a..4607d00f4 100644 --- a/examples/tutorials/scipy2008/container_nospace.py +++ b/examples/tutorials/scipy2008/container_nospace.py @@ -1,7 +1,7 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, HPlotContainer, Plot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/container_vertical.py b/examples/tutorials/scipy2008/container_vertical.py index 8ac8d78ec..a7806c9f0 100644 --- a/examples/tutorials/scipy2008/container_vertical.py +++ b/examples/tutorials/scipy2008/container_vertical.py @@ -1,7 +1,7 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, VPlotContainer, Plot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/custom_overlay.py b/examples/tutorials/scipy2008/custom_overlay.py index 76bd6c41d..69fb39399 100644 --- a/examples/tutorials/scipy2008/custom_overlay.py +++ b/examples/tutorials/scipy2008/custom_overlay.py @@ -2,8 +2,7 @@ from chaco.api import ArrayPlotData, Plot, AbstractOverlay from chaco.tools.api import PanTool -from enable.component_editor import ComponentEditor -from enable.api import ColorTrait +from enable.api import ColorTrait, ComponentEditor from traits.api import Button, Float, Range, HasTraits, Instance from traitsui.api import ( Item, diff --git a/examples/tutorials/scipy2008/custom_overlay_dataspace.py b/examples/tutorials/scipy2008/custom_overlay_dataspace.py index f9354ad40..24fb2321d 100644 --- a/examples/tutorials/scipy2008/custom_overlay_dataspace.py +++ b/examples/tutorials/scipy2008/custom_overlay_dataspace.py @@ -2,8 +2,7 @@ from chaco.api import ArrayPlotData, Plot, AbstractOverlay from chaco.tools.api import PanTool -from enable.component_editor import ComponentEditor -from enable.api import ColorTrait +from enable.api import ColorTrait, ComponentEditor from traits.api import Button, CArray, Bool, Float, Range, HasTraits, Instance from traitsui.api import ( Item, diff --git a/examples/tutorials/scipy2008/custom_overlay_movetool.py b/examples/tutorials/scipy2008/custom_overlay_movetool.py index b7429e905..1b30627f5 100644 --- a/examples/tutorials/scipy2008/custom_overlay_movetool.py +++ b/examples/tutorials/scipy2008/custom_overlay_movetool.py @@ -2,8 +2,7 @@ from chaco.api import ArrayPlotData, Plot, AbstractOverlay from chaco.tools.api import PanTool, MoveTool -from enable.component_editor import ComponentEditor -from enable.api import ColorTrait +from enable.api import ColorTrait, ComponentEditor from traits.api import ( Button, CArray, diff --git a/examples/tutorials/scipy2008/custom_tool.py b/examples/tutorials/scipy2008/custom_tool.py index 6afc507f0..e9460e89b 100644 --- a/examples/tutorials/scipy2008/custom_tool.py +++ b/examples/tutorials/scipy2008/custom_tool.py @@ -1,8 +1,7 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, Plot -from enable.api import BaseTool -from enable.component_editor import ComponentEditor +from enable.api import BaseTool, ComponentEditor from traits.api import Enum, HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/custom_tool_click.py b/examples/tutorials/scipy2008/custom_tool_click.py index 03da4947d..2db964700 100644 --- a/examples/tutorials/scipy2008/custom_tool_click.py +++ b/examples/tutorials/scipy2008/custom_tool_click.py @@ -1,8 +1,7 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, Plot -from enable.api import BaseTool -from enable.component_editor import ComponentEditor +from enable.api import BaseTool, ComponentEditor from traits.api import Enum, HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/custom_tool_screen.py b/examples/tutorials/scipy2008/custom_tool_screen.py index 7a9597d36..92346af74 100644 --- a/examples/tutorials/scipy2008/custom_tool_screen.py +++ b/examples/tutorials/scipy2008/custom_tool_screen.py @@ -1,8 +1,7 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, Plot -from enable.api import BaseTool -from enable.component_editor import ComponentEditor +from enable.api import BaseTool, ComponentEditor from traits.api import Enum, HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/data_chooser.py b/examples/tutorials/scipy2008/data_chooser.py index b75d3d594..f35450d1a 100644 --- a/examples/tutorials/scipy2008/data_chooser.py +++ b/examples/tutorials/scipy2008/data_chooser.py @@ -2,7 +2,7 @@ from scipy.special import jn from chaco.api import ArrayPlotData, Plot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import Dict, Enum, HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/first_plot.py b/examples/tutorials/scipy2008/first_plot.py index e82e82489..d882bfb3a 100644 --- a/examples/tutorials/scipy2008/first_plot.py +++ b/examples/tutorials/scipy2008/first_plot.py @@ -1,6 +1,6 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, Plot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/image.py b/examples/tutorials/scipy2008/image.py index e9a356c70..fb552bac1 100644 --- a/examples/tutorials/scipy2008/image.py +++ b/examples/tutorials/scipy2008/image.py @@ -1,7 +1,7 @@ from numpy import linspace, meshgrid, exp from chaco.api import ArrayPlotData, Plot, viridis -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/overlapping.py b/examples/tutorials/scipy2008/overlapping.py index 2c6cc79ce..d2fd6a9fa 100644 --- a/examples/tutorials/scipy2008/overlapping.py +++ b/examples/tutorials/scipy2008/overlapping.py @@ -1,7 +1,7 @@ from numpy import linspace, cos, sin from chaco.api import ArrayPlotData, Plot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/ploteditor.py b/examples/tutorials/scipy2008/ploteditor.py index ae46736bb..c88aa3f5a 100644 --- a/examples/tutorials/scipy2008/ploteditor.py +++ b/examples/tutorials/scipy2008/ploteditor.py @@ -2,7 +2,7 @@ from chaco.api import ArrayPlotData, Plot from chaco.tools.api import PanTool, ZoomTool -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import Enum, HasTraits, Instance from traitsui.api import Item, Group, View diff --git a/examples/tutorials/scipy2008/scatter.py b/examples/tutorials/scipy2008/scatter.py index c1fb03c5c..a528a48e7 100644 --- a/examples/tutorials/scipy2008/scatter.py +++ b/examples/tutorials/scipy2008/scatter.py @@ -1,6 +1,6 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, Plot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/tool_chooser.py b/examples/tutorials/scipy2008/tool_chooser.py index 5620b852d..513f5d3c5 100644 --- a/examples/tutorials/scipy2008/tool_chooser.py +++ b/examples/tutorials/scipy2008/tool_chooser.py @@ -2,7 +2,7 @@ from chaco.api import ArrayPlotData, Plot from chaco.tools.api import PanTool, ZoomTool, DragZoom -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance, List from traitsui.api import Item, View, CheckListEditor diff --git a/examples/tutorials/scipy2008/tools.py b/examples/tutorials/scipy2008/tools.py index 472e3a3b7..c80e6eb3e 100644 --- a/examples/tutorials/scipy2008/tools.py +++ b/examples/tutorials/scipy2008/tools.py @@ -2,7 +2,7 @@ from chaco.api import ArrayPlotData, Plot from chaco.tools.api import PanTool, ZoomTool, DragZoom -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/tutorials/scipy2008/traits_example.py b/examples/tutorials/scipy2008/traits_example.py index 998e04545..ad84e3a18 100644 --- a/examples/tutorials/scipy2008/traits_example.py +++ b/examples/tutorials/scipy2008/traits_example.py @@ -2,7 +2,7 @@ from enable.api import ColorTrait from chaco.api import ArrayPlotData, Plot, marker_trait -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance, Int from traitsui.api import Group, Item, View diff --git a/examples/tutorials/scipy2008/traits_image.py b/examples/tutorials/scipy2008/traits_image.py index 35a4c3ac5..8a7e46382 100644 --- a/examples/tutorials/scipy2008/traits_image.py +++ b/examples/tutorials/scipy2008/traits_image.py @@ -1,7 +1,7 @@ from numpy import linspace, meshgrid, exp from chaco.api import ArrayPlotData, Plot, viridis -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import Enum, HasTraits, Instance from traitsui.api import Group, Item, View diff --git a/examples/user_guide/grid_plot_container.py b/examples/user_guide/grid_plot_container.py index cd0b40e38..f49c68e5d 100644 --- a/examples/user_guide/grid_plot_container.py +++ b/examples/user_guide/grid_plot_container.py @@ -3,9 +3,7 @@ from chaco.api import ArrayPlotData, Plot, GridPlotContainer from chaco.example_support import COLOR_PALETTE - -from enable.component_editor import ComponentEditor - +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/user_guide/h_plot_container.py b/examples/user_guide/h_plot_container.py index 0240df6a9..4e46a7369 100644 --- a/examples/user_guide/h_plot_container.py +++ b/examples/user_guide/h_plot_container.py @@ -1,7 +1,7 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, HPlotContainer, Plot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/user_guide/h_plot_container_add_multiple_times.py b/examples/user_guide/h_plot_container_add_multiple_times.py index afb2ff5fc..5b8751b4b 100644 --- a/examples/user_guide/h_plot_container_add_multiple_times.py +++ b/examples/user_guide/h_plot_container_add_multiple_times.py @@ -5,7 +5,7 @@ from numpy import linspace, sin from chaco.api import ArrayPlotData, HPlotContainer, VPlotContainer, Plot -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/user_guide/h_plot_container_colorbar.py b/examples/user_guide/h_plot_container_colorbar.py index 6968a0147..336e0c61c 100644 --- a/examples/user_guide/h_plot_container_colorbar.py +++ b/examples/user_guide/h_plot_container_colorbar.py @@ -1,5 +1,5 @@ from chaco.api import ArrayPlotData, HPlotContainer, Plot, viridis, ColorBar -from enable.component_editor import ComponentEditor +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/user_guide/overlay_container_inset.py b/examples/user_guide/overlay_container_inset.py index 1474969a8..7a22caac0 100644 --- a/examples/user_guide/overlay_container_inset.py +++ b/examples/user_guide/overlay_container_inset.py @@ -3,9 +3,7 @@ from chaco.api import ArrayPlotData, Plot, OverlayPlotContainer from chaco.tools.api import ZoomTool, PanTool - -from enable.component_editor import ComponentEditor - +from enable.api import ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/user_guide/plot_types/create_plot_snapshots.py b/examples/user_guide/plot_types/create_plot_snapshots.py index 509ea62df..a071e4743 100644 --- a/examples/user_guide/plot_types/create_plot_snapshots.py +++ b/examples/user_guide/plot_types/create_plot_snapshots.py @@ -7,40 +7,43 @@ import argparse from functools import partial -from chaco.array_data_source import ArrayDataSource -from chaco.axis import PlotAxis -from chaco.cmap_image_plot import CMapImagePlot -from chaco.contour_line_plot import ContourLinePlot -from chaco.contour_poly_plot import ContourPolyPlot -from chaco.data_range_1d import DataRange1D -from chaco.data_range_2d import DataRange2D -from chaco.grid import PlotGrid -from chaco.jitterplot import JitterPlot -from chaco.lineplot import LinePlot -from chaco.multi_array_data_source import MultiArrayDataSource -from chaco.plot_graphics_context import PlotGraphicsContext +from chaco.api import ( + ArrayDataSource, + BarPlot, + CandlePlot, + CMapImagePlot, + ColormappedScatterPlot, + ContourLinePlot, + ContourPolyPlot, + DataRange1D, + DataRange2D, + ErrorBarPlot, + FilledLinePlot, + GridDataSource, + GridMapper, + ImageData, + ImagePlot, + JitterPlot, + LinePlot, + LinearMapper, + MultiArrayDataSource, + MultiLinePlot, + PlotAxis, + PlotGraphicsContext, + PlotGrid, + PolygonPlot, + QuiverPlot, + ScatterPlot, +) from chaco.polar_line_renderer import PolarLineRenderer from chaco.polar_mapper import PolarMapper -from chaco.polygon_plot import PolygonPlot -from chaco.quiverplot import QuiverPlot -from chaco.scatterplot import ScatterPlot -from chaco.linear_mapper import LinearMapper -from chaco.candle_plot import CandlePlot -from chaco.colormapped_scatterplot import ColormappedScatterPlot import chaco.default_colormaps as dc -from enable.colors import color_table +from enable.api import color_table import scipy.stats import numpy as np import sklearn.datasets as datasets -from chaco.errorbar_plot import ErrorBarPlot -from chaco.filled_line_plot import FilledLinePlot -from chaco.image_plot import ImagePlot -from chaco.grid_data_source import GridDataSource -from chaco.grid_mapper import GridMapper -from chaco.image_data import ImageData -from chaco.barplot import BarPlot -from chaco.multi_line_plot import MultiLinePlot + from plot_window import PlotWindow diff --git a/examples/user_guide/plot_types/plot_window.py b/examples/user_guide/plot_types/plot_window.py index 130267b29..822af2830 100644 --- a/examples/user_guide/plot_types/plot_window.py +++ b/examples/user_guide/plot_types/plot_window.py @@ -1,6 +1,5 @@ -from chaco.api import PlotComponent -from chaco.data_view import DataView -from enable.component_editor import ComponentEditor +from chaco.api import DataView, PlotComponent +from enable.api import ComponentEditor from traits.api import HasTraits, Instance, observe from traitsui.api import Item, View