Use api modules for ETS packages where possible

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, Trait, Tuple, Bool, 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

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

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

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):

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):

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):

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")

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 (

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):

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 (

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 (

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

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

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

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,

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):

chaco/tools/drag_tool.py

@@ -10,4 +10,4 @@
     DeprecationWarning,
 )
 
-from enable.tools.drag_tool import DragTool
+from enable.tools.api import DragTool

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

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):

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):

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
 
 

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):

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):

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):

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,

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,
 )
 
 

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
 
 

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):

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

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
 

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
 

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,

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
 

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
 

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):

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
 

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
 

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
 

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
 

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