Use traits.api, traitsui.api and pyface.api where possible.

enable/colors.py

@@ -167,7 +167,7 @@
 
 if not ETSConfig.toolkit:
     # Force Traits to decide on its toolkit if it hasn't already
-    from traitsui.toolkit import toolkit as traits_toolkit
+    from traitsui.api import toolkit as traits_toolkit
 
     traits_toolkit()
 

enable/savage/trait_defs/ui/svg_button_editor.py

@@ -23,8 +23,7 @@
 
 from traits.api import Bool, Enum, Int, Property, Range, Str, Any
 
-from traitsui.api import View
-from traitsui.basic_editor_factory import BasicEditorFactory
+from traitsui.api import BasicEditorFactory, View
 from traitsui.ui_traits import AView
 
 # -----------------------------------------------------------------------------

enable/savage/trait_defs/ui/svg_editor.py

@@ -25,8 +25,7 @@
 from enable.savage.trait_defs.ui.toolkit import toolkit_object
 
 from traits.api import Property
-
-from traitsui.basic_editor_factory import BasicEditorFactory
+from traitsui.api import BasicEditorFactory
 
 # -----------------------------------------------------------------------------
 #  'SVGEditor' editor factory class:

enable/savage/trait_defs/ui/toolkit.py

@@ -24,7 +24,7 @@ def _init_toolkit():
     """
 
     # Force Traits to decide on its toolkit if it hasn't already
-    from traitsui.toolkit import toolkit as traits_toolkit
+    from traitsui.api import toolkit as traits_toolkit
 
     traits_toolkit()
 

enable/tests/primitives/test_image.py

@@ -9,7 +9,7 @@
 
 from kiva.image import GraphicsContext
 from traits.api import TraitError
-from traits.testing.unittest_tools import UnittestTools
+from traits.testing.api import UnittestTools
 
 from enable.primitives.image import Image
 

enable/tests/qt4/test_scrollbar.py

@@ -2,7 +2,7 @@
 import unittest
 
 from enable.tests._testing import skip_if_not_qt
-from pyface.gui import GUI
+from pyface.api import GUI
 
 from enable.container import Container
 from enable.window import Window

enable/tests/test_component_editor.py

@@ -3,10 +3,8 @@
 import unittest
 
 from enable.component_editor import ComponentEditor
-from traits.has_traits import HasTraits
-from traits.trait_types import Any
-from traitsui.item import Item
-from traitsui.view import View
+from traits.api import Any, HasTraits
+from traitsui.api import Item, View
 
 from enable.tests._testing import get_dialog_size, skip_if_null
 

enable/tests/tools/pyface/test_commands.py

@@ -10,7 +10,7 @@
 from unittest.mock import MagicMock
 
 # Enthought library imports
-from traits.testing.unittest_tools import UnittestTools
+from traits.testing.api import UnittestTools
 
 # Local library imports
 from enable.component import Component

enable/tests/tools/pyface/test_move_command_tool.py

@@ -11,7 +11,7 @@
 
 # Enthought library imports
 from pyface.undo.api import CommandStack
-from traits.testing.unittest_tools import UnittestTools
+from traits.testing.api import UnittestTools
 
 # Local library imports
 from enable.component import Component

enable/tests/tools/pyface/test_resize_command_tool.py

@@ -11,7 +11,7 @@
 
 # Enthought library imports
 from pyface.undo.api import CommandStack
-from traits.testing.unittest_tools import UnittestTools
+from traits.testing.api import UnittestTools
 
 # Local library imports
 from enable.component import Component

enable/tests/tools/pyface/test_undo_tool.py

@@ -11,7 +11,7 @@
 
 # Enthought library imports
 from pyface.undo.api import UndoManager
-from traits.testing.unittest_tools import UnittestTools
+from traits.testing.api import UnittestTools
 
 # Local library imports
 from enable.base_tool import KeySpec

enable/tests/tools/test_button_tool.py

@@ -7,7 +7,7 @@
 #
 import unittest
 
-from traits.testing.unittest_tools import UnittestTools
+from traits.testing.api import UnittestTools
 
 from enable.component import Component
 from enable.testing import EnableTestAssistant

enable/toolkit.py

@@ -26,7 +26,7 @@ def _init_toolkit():
 
     if not ETSConfig.toolkit:
         # Force Traits to decide on its toolkit if it hasn't already
-        from traitsui.toolkit import toolkit as traits_toolkit
+        from traitsui.api import toolkit as traits_toolkit
 
         traits_toolkit()
 

enable/trait_defs/ui/wx/rgba_color_editor.py

@@ -21,9 +21,8 @@
 from traits.api import Bool
 from traits.trait_base import SequenceTypes
 
-from traitsui.api import View
+from traitsui.api import EditorFactory, View
 from traitsui.wx.editor import Editor
-from traitsui.editor_factory import EditorFactory
 from traitsui.wx.editor_factory import ReadonlyEditor
 from traitsui.wx.helper import position_window