From 1c8c918a174235e2b62a8b2df9fba6003aa3fd64 Mon Sep 17 00:00:00 2001
From: Aaron Ayres <aayres@enthought.com>
Date: Wed, 28 Apr 2021 10:01:36 -0500
Subject: [PATCH 1/6] move example helper moodules into examples

---
 enable/examples/demo/enable/basic_draw.py                      | 2 +-
 enable/examples/demo/enable/basic_move.py                      | 2 +-
 enable/examples/demo/enable/brush_draw.py                      | 2 +-
 enable/examples/demo/enable/canvas_demo.py                     | 2 +-
 enable/examples/demo/enable/compass_example.py                 | 2 +-
 enable/examples/demo/enable/container_demo.py                  | 2 +-
 enable/examples/demo/enable/filled_container_demo.py           | 2 +-
 enable/examples/demo/enable/gradient_demo.py                   | 2 +-
 enable/examples/demo/enable/image_draw.py                      | 2 +-
 enable/examples/demo/enable/label_test.py                      | 2 +-
 enable/examples/demo/enable/latency_demo.py                    | 2 +-
 enable/examples/demo/enable/primitives_demo.py                 | 2 +-
 enable/examples/demo/enable/resize_tool_demo.py                | 2 +-
 enable/examples/demo/enable/scrollbar_demo.py                  | 2 +-
 enable/examples/demo/enable/scrolled_canvas_demo.py            | 2 +-
 enable/examples/demo/enable/scrolled_demo.py                   | 2 +-
 enable/examples/demo/enable/shapes/run.py                      | 2 +-
 enable/examples/demo/enable/slider_example.py                  | 2 +-
 enable/examples/demo/enable/stacked_container_demo.py          | 2 +-
 enable/examples/demo/enable/text_field_demo.py                 | 2 +-
 enable/examples/demo/enable/text_grid_demo.py                  | 2 +-
 enable/examples/demo/enable/tools/button_tool.py               | 2 +-
 enable/examples/demo/enable/tools/drop_tool.py                 | 2 +-
 enable/examples/demo/enable/tools/pyface/context_menu.py       | 2 +-
 enable/examples/demo/enable/tools/pyface/undoable_move_tool.py | 2 +-
 enable/examples/demo/enable/view_bounds_test.py                | 2 +-
 enable/examples/demo/enable/zoomed_event_demo.py               | 2 +-
 enable/{ => examples}/example_application.py                   | 0
 enable/{ => examples}/example_canvas.py                        | 0
 enable/{ => examples}/example_support.py                       | 0
 enable/text_field_grid.py                                      | 2 +-
 kiva/examples/kiva/compiled_path.py                            | 2 +-
 kiva/examples/kiva/dash.py                                     | 2 +-
 kiva/examples/kiva/ellipse.py                                  | 2 +-
 kiva/examples/kiva/gradient.py                                 | 2 +-
 kiva/examples/kiva/qt4_simple.py                               | 2 +-
 kiva/examples/kiva/rect.py                                     | 2 +-
 kiva/examples/kiva/simple.py                                   | 2 +-
 kiva/examples/kiva/simple2.py                                  | 2 +-
 kiva/examples/kiva/star.py                                     | 2 +-
 kiva/examples/kiva/star1.py                                    | 2 +-
 kiva/examples/kiva/ui_gradient.py                              | 2 +-
 kiva/examples/kiva/ui_text.py                                  | 2 +-
 43 files changed, 40 insertions(+), 40 deletions(-)
 rename enable/{ => examples}/example_application.py (100%)
 rename enable/{ => examples}/example_canvas.py (100%)
 rename enable/{ => examples}/example_support.py (100%)

diff --git a/enable/examples/demo/enable/basic_draw.py b/enable/examples/demo/enable/basic_draw.py
index a18aca324..87c60ebef 100644
--- a/enable/examples/demo/enable/basic_draw.py
+++ b/enable/examples/demo/enable/basic_draw.py
@@ -11,7 +11,7 @@
 This demonstrates the most basic drawing capabilities using Enable.  A new
 component is created and added to a container.
 """
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.api import Component, Container
 
 
diff --git a/enable/examples/demo/enable/basic_move.py b/enable/examples/demo/enable/basic_move.py
index 9f21804b4..a76ac8f94 100644
--- a/enable/examples/demo/enable/basic_move.py
+++ b/enable/examples/demo/enable/basic_move.py
@@ -14,7 +14,7 @@
 from traits.api import Float
 
 from enable.api import Component, Pointer, Container
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 
 
 class Box(Component):
diff --git a/enable/examples/demo/enable/brush_draw.py b/enable/examples/demo/enable/brush_draw.py
index e94c6f81b..52b50b34f 100644
--- a/enable/examples/demo/enable/brush_draw.py
+++ b/enable/examples/demo/enable/brush_draw.py
@@ -12,7 +12,7 @@
 """
 from traits.api import Instance
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.api import (
     Brush, ColorStop, Component, Container, Gradient, RadialGradientBrush
 )
diff --git a/enable/examples/demo/enable/canvas_demo.py b/enable/examples/demo/enable/canvas_demo.py
index ef0d88784..034b53b65 100644
--- a/enable/examples/demo/enable/canvas_demo.py
+++ b/enable/examples/demo/enable/canvas_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Canvas, Viewport
-from enable.example_support import demo_main, DemoFrame
+from enable.examples.example_support import demo_main, DemoFrame
 from enable.tools.api import ViewportPanTool
 
 
diff --git a/enable/examples/demo/enable/compass_example.py b/enable/examples/demo/enable/compass_example.py
index 1f1155386..629bcd320 100644
--- a/enable/examples/demo/enable/compass_example.py
+++ b/enable/examples/demo/enable/compass_example.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import OverlayContainer, Compass
-from enable.example_support import demo_main, DemoFrame
+from enable.examples.example_support import demo_main, DemoFrame
 
 
 class Demo(DemoFrame):
diff --git a/enable/examples/demo/enable/container_demo.py b/enable/examples/demo/enable/container_demo.py
index b6312f331..4497f5e0e 100644
--- a/enable/examples/demo/enable/container_demo.py
+++ b/enable/examples/demo/enable/container_demo.py
@@ -11,7 +11,7 @@
 from traits.api import Enum, Float, Int, Str, Tuple
 
 from enable.api import ColorTrait
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.tools.api import DragTool
 from kiva.trait_defs.api import KivaFont
 
diff --git a/enable/examples/demo/enable/filled_container_demo.py b/enable/examples/demo/enable/filled_container_demo.py
index f98841dea..2d23a8109 100644
--- a/enable/examples/demo/enable/filled_container_demo.py
+++ b/enable/examples/demo/enable/filled_container_demo.py
@@ -22,7 +22,7 @@
 from traits.api import Any, Enum, Float, Instance, Tuple
 
 from enable.api import Container, Component, Pointer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from kiva.fonttools import str_to_font
 
 
diff --git a/enable/examples/demo/enable/gradient_demo.py b/enable/examples/demo/enable/gradient_demo.py
index 3747cee6b..afb8a73a0 100644
--- a/enable/examples/demo/enable/gradient_demo.py
+++ b/enable/examples/demo/enable/gradient_demo.py
@@ -26,7 +26,7 @@
 from traits.api import Instance, Int, observe
 from traitsui.api import Item, OKCancelButtons, View
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.api import (
     AbstractOverlay, BaseTool, ColorStop, Component, Gradient,
     LinearGradientBrush, black_color_trait, marker_trait
diff --git a/enable/examples/demo/enable/image_draw.py b/enable/examples/demo/enable/image_draw.py
index 3948f7b91..8f6789dd7 100644
--- a/enable/examples/demo/enable/image_draw.py
+++ b/enable/examples/demo/enable/image_draw.py
@@ -13,7 +13,7 @@
 import os
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 
 THIS_DIR = os.path.split(__file__)[0]
diff --git a/enable/examples/demo/enable/label_test.py b/enable/examples/demo/enable/label_test.py
index 6ecfe2046..6fd241e7b 100644
--- a/enable/examples/demo/enable/label_test.py
+++ b/enable/examples/demo/enable/label_test.py
@@ -9,7 +9,7 @@
 # Thanks for using Enthought open source!
 """ Small demo of the Label component.  """
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.label import Label
 
 
diff --git a/enable/examples/demo/enable/latency_demo.py b/enable/examples/demo/enable/latency_demo.py
index 4a17503bf..8b15058a7 100644
--- a/enable/examples/demo/enable/latency_demo.py
+++ b/enable/examples/demo/enable/latency_demo.py
@@ -16,7 +16,7 @@
 from traits.api import Float
 
 from enable.api import Component, Container, ColorTrait, black_color_trait
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from kiva.api import SWISS, Font
 
 font = Font(family=SWISS)
diff --git a/enable/examples/demo/enable/primitives_demo.py b/enable/examples/demo/enable/primitives_demo.py
index 75e04e2d6..6366a87e9 100644
--- a/enable/examples/demo/enable/primitives_demo.py
+++ b/enable/examples/demo/enable/primitives_demo.py
@@ -16,7 +16,7 @@
     DragLine, DragPolygon, DragSegment, DrawingCanvas, DrawingCanvasToolbar,
     DrawingTool, PointLine, PointPolygon, ToolbarButton
 )
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 
 
 class ResetButton(ToolbarButton):
diff --git a/enable/examples/demo/enable/resize_tool_demo.py b/enable/examples/demo/enable/resize_tool_demo.py
index 8798dfda7..303456fcf 100644
--- a/enable/examples/demo/enable/resize_tool_demo.py
+++ b/enable/examples/demo/enable/resize_tool_demo.py
@@ -11,7 +11,7 @@
 This demonstrates the resize tool.
 """
 from enable.api import Component, Container
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.tools.resize_tool import ResizeTool
 
 
diff --git a/enable/examples/demo/enable/scrollbar_demo.py b/enable/examples/demo/enable/scrollbar_demo.py
index b1a3c7a65..6ee46cae7 100644
--- a/enable/examples/demo/enable/scrollbar_demo.py
+++ b/enable/examples/demo/enable/scrollbar_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Container, Label, NativeScrollBar
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 
 
 class Demo(DemoFrame):
diff --git a/enable/examples/demo/enable/scrolled_canvas_demo.py b/enable/examples/demo/enable/scrolled_canvas_demo.py
index 98caccde9..5bce37900 100644
--- a/enable/examples/demo/enable/scrolled_canvas_demo.py
+++ b/enable/examples/demo/enable/scrolled_canvas_demo.py
@@ -19,7 +19,7 @@
 from numpy import array
 
 from enable.api import Canvas, Viewport, Scrolled
-from enable.example_support import demo_main, DemoFrame
+from enable.examples.example_support import demo_main, DemoFrame
 from enable.primitives.api import Box
 from enable.tools.api import ViewportPanTool
 
diff --git a/enable/examples/demo/enable/scrolled_demo.py b/enable/examples/demo/enable/scrolled_demo.py
index 6f1b399bd..cbe31ca5c 100644
--- a/enable/examples/demo/enable/scrolled_demo.py
+++ b/enable/examples/demo/enable/scrolled_demo.py
@@ -14,7 +14,7 @@
 from traits.api import Enum, Float, Instance, Tuple
 
 from enable.api import Component, Scrolled, Container, Pointer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 
 
 class Circle(Component):
diff --git a/enable/examples/demo/enable/shapes/run.py b/enable/examples/demo/enable/shapes/run.py
index 4b21b7910..5d39e24b2 100644
--- a/enable/examples/demo/enable/shapes/run.py
+++ b/enable/examples/demo/enable/shapes/run.py
@@ -13,7 +13,7 @@
 
 # Enthought library imports.
 from enable.api import Container
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 
 # Local imports
 from enable.examples.demo.enable.shapes.api import Box, Circle
diff --git a/enable/examples/demo/enable/slider_example.py b/enable/examples/demo/enable/slider_example.py
index 9b81d66b1..6de82ff49 100644
--- a/enable/examples/demo/enable/slider_example.py
+++ b/enable/examples/demo/enable/slider_example.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import OverlayContainer, Slider
-from enable.example_support import demo_main, DemoFrame
+from enable.examples.example_support import demo_main, DemoFrame
 
 
 class Demo(DemoFrame):
diff --git a/enable/examples/demo/enable/stacked_container_demo.py b/enable/examples/demo/enable/stacked_container_demo.py
index 734a1a098..9e0f73402 100644
--- a/enable/examples/demo/enable/stacked_container_demo.py
+++ b/enable/examples/demo/enable/stacked_container_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Container, Window, TextField
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.stacked_container import VStackedContainer, HStackedContainer
 
 size = (240, 240)
diff --git a/enable/examples/demo/enable/text_field_demo.py b/enable/examples/demo/enable/text_field_demo.py
index 3bb0d32af..7531ee979 100644
--- a/enable/examples/demo/enable/text_field_demo.py
+++ b/enable/examples/demo/enable/text_field_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Container, TextField
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 
 
 size = (500, 400)
diff --git a/enable/examples/demo/enable/text_grid_demo.py b/enable/examples/demo/enable/text_grid_demo.py
index ca18a423a..a60d4da63 100644
--- a/enable/examples/demo/enable/text_grid_demo.py
+++ b/enable/examples/demo/enable/text_grid_demo.py
@@ -10,7 +10,7 @@
 from numpy import array
 
 from enable.api import Container
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.text_grid import TextGrid
 
 size = (400, 100)
diff --git a/enable/examples/demo/enable/tools/button_tool.py b/enable/examples/demo/enable/tools/button_tool.py
index 0c4c042f7..afb563721 100644
--- a/enable/examples/demo/enable/tools/button_tool.py
+++ b/enable/examples/demo/enable/tools/button_tool.py
@@ -17,7 +17,7 @@
 
 from enable.api import Container, transparent_color
 from enable.colors import ColorTrait
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.primitives.api import Box
 from enable.tools.button_tool import ButtonTool
 
diff --git a/enable/examples/demo/enable/tools/drop_tool.py b/enable/examples/demo/enable/tools/drop_tool.py
index a683200c0..2d1ea27d0 100644
--- a/enable/examples/demo/enable/tools/drop_tool.py
+++ b/enable/examples/demo/enable/tools/drop_tool.py
@@ -11,7 +11,7 @@
 This demonstrates the use of the drop tool.
 """
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.api import Component, Container, Label
 from enable.tools.base_drop_tool import BaseDropTool
 
diff --git a/enable/examples/demo/enable/tools/pyface/context_menu.py b/enable/examples/demo/enable/tools/pyface/context_menu.py
index a888b88fc..f88d31789 100644
--- a/enable/examples/demo/enable/tools/pyface/context_menu.py
+++ b/enable/examples/demo/enable/tools/pyface/context_menu.py
@@ -12,7 +12,7 @@
 component is created and added to a container.
 """
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.api import Component, Container
 from enable.tools.pyface.context_menu_tool import ContextMenuTool
 
diff --git a/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py b/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py
index 2209e7cfb..7ef04b93e 100644
--- a/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py
+++ b/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py
@@ -27,7 +27,7 @@
 from traits.api import Instance
 
 from enable.api import Container, Window, KeySpec
-from enable.example_application import DemoApplication, demo_main
+from enable.examples.example_application import DemoApplication, demo_main
 from enable.primitives.api import Box
 from enable.tools.pyface.api import MoveCommandTool, UndoTool
 
diff --git a/enable/examples/demo/enable/view_bounds_test.py b/enable/examples/demo/enable/view_bounds_test.py
index 67f56bd8a..29d7f993f 100644
--- a/enable/examples/demo/enable/view_bounds_test.py
+++ b/enable/examples/demo/enable/view_bounds_test.py
@@ -13,7 +13,7 @@
 
 from enable.api import Container, Component, Scrolled
 from enable.base import empty_rectangle, intersect_bounds
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 
 
 class Box(Component):
diff --git a/enable/examples/demo/enable/zoomed_event_demo.py b/enable/examples/demo/enable/zoomed_event_demo.py
index b5742e10e..368cef52b 100644
--- a/enable/examples/demo/enable/zoomed_event_demo.py
+++ b/enable/examples/demo/enable/zoomed_event_demo.py
@@ -13,7 +13,7 @@
 from traits.api import Float
 
 from enable.api import AbstractOverlay, Canvas, Viewport, ColorTrait, Scrolled
-from enable.example_support import demo_main, DemoFrame
+from enable.examples.example_support import demo_main, DemoFrame
 from enable.primitives.api import Box
 from enable.tools.api import ViewportPanTool
 
diff --git a/enable/example_application.py b/enable/examples/example_application.py
similarity index 100%
rename from enable/example_application.py
rename to enable/examples/example_application.py
diff --git a/enable/example_canvas.py b/enable/examples/example_canvas.py
similarity index 100%
rename from enable/example_canvas.py
rename to enable/examples/example_canvas.py
diff --git a/enable/example_support.py b/enable/examples/example_support.py
similarity index 100%
rename from enable/example_support.py
rename to enable/examples/example_support.py
diff --git a/enable/text_field_grid.py b/enable/text_field_grid.py
index 133b8fb0a..cde28d90d 100644
--- a/enable/text_field_grid.py
+++ b/enable/text_field_grid.py
@@ -188,7 +188,7 @@ def _cells_changed(self, new):
 if __name__ == "__main__":
     from enable.wx_backend.api import Window
     from enable.api import Container
-    from enable.example_support import DemoFrame, demo_main
+    from enable.examples.example_support import DemoFrame, demo_main
 
     class MyFrame(DemoFrame):
         def _create_window(self):
diff --git a/kiva/examples/kiva/compiled_path.py b/kiva/examples/kiva/compiled_path.py
index 6bdb9e49d..de27ebcc0 100644
--- a/kiva/examples/kiva/compiled_path.py
+++ b/kiva/examples/kiva/compiled_path.py
@@ -16,7 +16,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.api import STROKE
 from kiva.image import GraphicsContext, CompiledPath
diff --git a/kiva/examples/kiva/dash.py b/kiva/examples/kiva/dash.py
index fe3c17bf5..ec1342161 100644
--- a/kiva/examples/kiva/dash.py
+++ b/kiva/examples/kiva/dash.py
@@ -13,7 +13,7 @@
 import numpy
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.agg import GraphicsContextArray
diff --git a/kiva/examples/kiva/ellipse.py b/kiva/examples/kiva/ellipse.py
index c36faaf66..bbec4b519 100644
--- a/kiva/examples/kiva/ellipse.py
+++ b/kiva/examples/kiva/ellipse.py
@@ -12,7 +12,7 @@
 from scipy import pi
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/gradient.py b/kiva/examples/kiva/gradient.py
index 592874e0e..35f364994 100644
--- a/kiva/examples/kiva/gradient.py
+++ b/kiva/examples/kiva/gradient.py
@@ -12,7 +12,7 @@
 from numpy import array, pi
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.image import GraphicsContext
diff --git a/kiva/examples/kiva/qt4_simple.py b/kiva/examples/kiva/qt4_simple.py
index 676ae552e..555cfd0da 100644
--- a/kiva/examples/kiva/qt4_simple.py
+++ b/kiva/examples/kiva/qt4_simple.py
@@ -16,7 +16,7 @@
 
 ETSConfig.toolkit = "qt4.qpainter"
 
-from enable.example_canvas import Canvas
+from enable.examples.example_canvas import Canvas
 
 try:
     from pyface.qt import QtGui
diff --git a/kiva/examples/kiva/rect.py b/kiva/examples/kiva/rect.py
index 89c4ae1c0..dc37caefe 100644
--- a/kiva/examples/kiva/rect.py
+++ b/kiva/examples/kiva/rect.py
@@ -10,7 +10,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/simple.py b/kiva/examples/kiva/simple.py
index 6cb46bf76..52356a920 100644
--- a/kiva/examples/kiva/simple.py
+++ b/kiva/examples/kiva/simple.py
@@ -10,7 +10,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.image import GraphicsContext
diff --git a/kiva/examples/kiva/simple2.py b/kiva/examples/kiva/simple2.py
index 828a1522a..529d9c95c 100644
--- a/kiva/examples/kiva/simple2.py
+++ b/kiva/examples/kiva/simple2.py
@@ -10,7 +10,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/star.py b/kiva/examples/kiva/star.py
index b99127699..010b04301 100644
--- a/kiva/examples/kiva/star.py
+++ b/kiva/examples/kiva/star.py
@@ -12,7 +12,7 @@
 from scipy import pi
 
 from enable.api import ConstraintsContainer
-from enable.example_support import demo_main, DemoFrame
+from enable.examples.example_support import demo_main, DemoFrame
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/star1.py b/kiva/examples/kiva/star1.py
index 4be9b6dd5..57f419a22 100644
--- a/kiva/examples/kiva/star1.py
+++ b/kiva/examples/kiva/star1.py
@@ -13,7 +13,7 @@
 from traitsui.api import Item, View
 
 from enable.api import ConstraintsContainer, Component, ComponentEditor
-from enable.example_support import demo_main, DemoFrame
+from enable.examples.example_support import demo_main, DemoFrame
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.image import GraphicsContext
diff --git a/kiva/examples/kiva/ui_gradient.py b/kiva/examples/kiva/ui_gradient.py
index e440064cb..619f8cdfc 100644
--- a/kiva/examples/kiva/ui_gradient.py
+++ b/kiva/examples/kiva/ui_gradient.py
@@ -10,7 +10,7 @@
 import numpy as np
 
 from enable.api import Component
-from enable.example_support import demo_main, DemoFrame
+from enable.examples.example_support import demo_main, DemoFrame
 
 
 class MyCanvas(Component):
diff --git a/kiva/examples/kiva/ui_text.py b/kiva/examples/kiva/ui_text.py
index 4037dacf2..b7d8bc10f 100644
--- a/kiva/examples/kiva/ui_text.py
+++ b/kiva/examples/kiva/ui_text.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Component
-from enable.example_support import DemoFrame, demo_main
+from enable.examples.example_support import DemoFrame, demo_main
 
 
 def glyph_a(gc):

From f1e9d65af1f59c8ef8af6fc2d63da4118ad9d6e9 Mon Sep 17 00:00:00 2001
From: Aaron Ayres <aayres@enthought.com>
Date: Wed, 19 May 2021 11:26:06 -0500
Subject: [PATCH 2/6] add old stub modules raising warnings to avoid breaks

---
 enable/example_application.py | 28 ++++++++++++++++++++++++++++
 enable/example_canvas.py      | 25 +++++++++++++++++++++++++
 enable/example_support.py     | 24 ++++++++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 enable/example_application.py
 create mode 100644 enable/example_canvas.py
 create mode 100644 enable/example_support.py

diff --git a/enable/example_application.py b/enable/example_application.py
new file mode 100644
index 000000000..88d64ab41
--- /dev/null
+++ b/enable/example_application.py
@@ -0,0 +1,28 @@
+# (C) Copyright 2005-2021 Enthought, Inc., Austin, TX
+# All rights reserved.
+#
+# This software is provided without warranty under the terms of the BSD
+# license included in LICENSE.txt and may be redistributed only under
+# the conditions described in the aforementioned license. The license
+# is also available online at http://www.enthought.com/licenses/BSD.txt
+#
+# Thanks for using Enthought open source!
+"""
+Example Application Support
+===========================
+
+This module provides a simple Pyface application that can be used by examples
+in places where a DemoFrame is insufficient. Note this has been moved to
+sit in enable/examples.  This module is kept for backwards compatibility.
+
+"""
+import warnings
+
+from enable.examples.example_application import DemoApplication
+
+warnings.warn(
+    "Importing from this module is deprecated, and this module will be"
+    " removed in a future release.",
+    DeprecationWarning,
+    stacklevel=2
+)
diff --git a/enable/example_canvas.py b/enable/example_canvas.py
new file mode 100644
index 000000000..4076f4b94
--- /dev/null
+++ b/enable/example_canvas.py
@@ -0,0 +1,25 @@
+# (C) Copyright 2005-2021 Enthought, Inc., Austin, TX
+# All rights reserved.
+#
+# This software is provided without warranty under the terms of the BSD
+# license included in LICENSE.txt and may be redistributed only under
+# the conditions described in the aforementioned license. The license
+# is also available online at http://www.enthought.com/licenses/BSD.txt
+#
+# Thanks for using Enthought open source!
+"""
+A suitable replacement for the old Canvas class in Kiva. 
+Note this has been moved to sit in enable/examples.  This module is kept for
+backwards compatibility.
+
+"""
+import warnings
+
+from enable.examples.example_canvas import Canvas
+
+warnings.warn(
+    "Importing from this module is deprecated, and this module will be"
+    " removed in a future release.",
+    DeprecationWarning,
+    stacklevel=2
+)
diff --git a/enable/example_support.py b/enable/example_support.py
new file mode 100644
index 000000000..ce8b12a03
--- /dev/null
+++ b/enable/example_support.py
@@ -0,0 +1,24 @@
+# (C) Copyright 2005-2021 Enthought, Inc., Austin, TX
+# All rights reserved.
+#
+# This software is provided without warranty under the terms of the BSD
+# license included in LICENSE.txt and may be redistributed only under
+# the conditions described in the aforementioned license. The license
+# is also available online at http://www.enthought.com/licenses/BSD.txt
+#
+# Thanks for using Enthought open source!
+"""
+Support class that wraps up the boilerplate toolkit calls that virtually all
+demo programs have to use.  Note this has been moved to sit in enable/examples.
+This module is kept for backwards compatibility.
+"""
+import warnings
+
+from enable.examples.example_support import DemoFrame, demo_main
+
+warnings.warn(
+    "Importing from this module is deprecated, and this module will be"
+    " removed in a future release.",
+    DeprecationWarning,
+    stacklevel=2
+)

From dac71ae64bb3052cf9b72ac7ee19247c0f63a4db Mon Sep 17 00:00:00 2001
From: aaronayres35 <36972686+aaronayres35@users.noreply.github.com>
Date: Mon, 21 Jun 2021 05:32:29 -0700
Subject: [PATCH 3/6] Update enable/example_application.py

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>
---
 enable/example_application.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/enable/example_application.py b/enable/example_application.py
index 88d64ab41..2a147df21 100644
--- a/enable/example_application.py
+++ b/enable/example_application.py
@@ -18,7 +18,7 @@
 """
 import warnings
 
-from enable.examples.example_application import DemoApplication
+from enable.examples.example_application import DemoApplication, demo_main
 
 warnings.warn(
     "Importing from this module is deprecated, and this module will be"

From 706228baaf2f9df346918e424efa64e9778cb519 Mon Sep 17 00:00:00 2001
From: Aaron Ayres <aayres@enthought.com>
Date: Mon, 21 Jun 2021 07:48:31 -0500
Subject: [PATCH 4/6] rename modules as private

---
 enable/example_application.py                                   | 2 +-
 enable/example_canvas.py                                        | 2 +-
 enable/example_support.py                                       | 2 +-
 .../{example_application.py => _example_application.py}         | 0
 enable/examples/{example_canvas.py => _example_canvas.py}       | 0
 enable/examples/{example_support.py => _example_support.py}     | 0
 enable/examples/demo/enable/basic_draw.py                       | 2 +-
 enable/examples/demo/enable/basic_move.py                       | 2 +-
 enable/examples/demo/enable/brush_draw.py                       | 2 +-
 enable/examples/demo/enable/canvas_demo.py                      | 2 +-
 enable/examples/demo/enable/compass_example.py                  | 2 +-
 enable/examples/demo/enable/container_demo.py                   | 2 +-
 enable/examples/demo/enable/filled_container_demo.py            | 2 +-
 enable/examples/demo/enable/gradient_demo.py                    | 2 +-
 enable/examples/demo/enable/image_draw.py                       | 2 +-
 enable/examples/demo/enable/label_test.py                       | 2 +-
 enable/examples/demo/enable/latency_demo.py                     | 2 +-
 enable/examples/demo/enable/primitives_demo.py                  | 2 +-
 enable/examples/demo/enable/resize_tool_demo.py                 | 2 +-
 enable/examples/demo/enable/scrollbar_demo.py                   | 2 +-
 enable/examples/demo/enable/scrolled_canvas_demo.py             | 2 +-
 enable/examples/demo/enable/scrolled_demo.py                    | 2 +-
 enable/examples/demo/enable/shapes/run.py                       | 2 +-
 enable/examples/demo/enable/slider_example.py                   | 2 +-
 enable/examples/demo/enable/stacked_container_demo.py           | 2 +-
 enable/examples/demo/enable/text_field_demo.py                  | 2 +-
 enable/examples/demo/enable/text_grid_demo.py                   | 2 +-
 enable/examples/demo/enable/tools/button_tool.py                | 2 +-
 enable/examples/demo/enable/tools/drop_tool.py                  | 2 +-
 enable/examples/demo/enable/tools/pyface/context_menu.py        | 2 +-
 enable/examples/demo/enable/tools/pyface/undoable_move_tool.py  | 2 +-
 enable/examples/demo/enable/view_bounds_test.py                 | 2 +-
 enable/examples/demo/enable/zoomed_event_demo.py                | 2 +-
 enable/text_field_grid.py                                       | 2 +-
 kiva/examples/kiva/compiled_path.py                             | 2 +-
 kiva/examples/kiva/dash.py                                      | 2 +-
 kiva/examples/kiva/ellipse.py                                   | 2 +-
 kiva/examples/kiva/gradient.py                                  | 2 +-
 kiva/examples/kiva/qt4_simple.py                                | 2 +-
 kiva/examples/kiva/rect.py                                      | 2 +-
 kiva/examples/kiva/simple.py                                    | 2 +-
 kiva/examples/kiva/simple2.py                                   | 2 +-
 kiva/examples/kiva/star.py                                      | 2 +-
 kiva/examples/kiva/star1.py                                     | 2 +-
 kiva/examples/kiva/ui_gradient.py                               | 2 +-
 kiva/examples/kiva/ui_text.py                                   | 2 +-
 46 files changed, 43 insertions(+), 43 deletions(-)
 rename enable/examples/{example_application.py => _example_application.py} (100%)
 rename enable/examples/{example_canvas.py => _example_canvas.py} (100%)
 rename enable/examples/{example_support.py => _example_support.py} (100%)

diff --git a/enable/example_application.py b/enable/example_application.py
index 2a147df21..0af85b957 100644
--- a/enable/example_application.py
+++ b/enable/example_application.py
@@ -18,7 +18,7 @@
 """
 import warnings
 
-from enable.examples.example_application import DemoApplication, demo_main
+from enable.examples._example_application import DemoApplication, demo_main
 
 warnings.warn(
     "Importing from this module is deprecated, and this module will be"
diff --git a/enable/example_canvas.py b/enable/example_canvas.py
index 4076f4b94..290657e88 100644
--- a/enable/example_canvas.py
+++ b/enable/example_canvas.py
@@ -15,7 +15,7 @@
 """
 import warnings
 
-from enable.examples.example_canvas import Canvas
+from enable.examples._example_canvas import Canvas
 
 warnings.warn(
     "Importing from this module is deprecated, and this module will be"
diff --git a/enable/example_support.py b/enable/example_support.py
index ce8b12a03..a1b4222e8 100644
--- a/enable/example_support.py
+++ b/enable/example_support.py
@@ -14,7 +14,7 @@
 """
 import warnings
 
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 warnings.warn(
     "Importing from this module is deprecated, and this module will be"
diff --git a/enable/examples/example_application.py b/enable/examples/_example_application.py
similarity index 100%
rename from enable/examples/example_application.py
rename to enable/examples/_example_application.py
diff --git a/enable/examples/example_canvas.py b/enable/examples/_example_canvas.py
similarity index 100%
rename from enable/examples/example_canvas.py
rename to enable/examples/_example_canvas.py
diff --git a/enable/examples/example_support.py b/enable/examples/_example_support.py
similarity index 100%
rename from enable/examples/example_support.py
rename to enable/examples/_example_support.py
diff --git a/enable/examples/demo/enable/basic_draw.py b/enable/examples/demo/enable/basic_draw.py
index 87c60ebef..07bef145e 100644
--- a/enable/examples/demo/enable/basic_draw.py
+++ b/enable/examples/demo/enable/basic_draw.py
@@ -11,7 +11,7 @@
 This demonstrates the most basic drawing capabilities using Enable.  A new
 component is created and added to a container.
 """
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import Component, Container
 
 
diff --git a/enable/examples/demo/enable/basic_move.py b/enable/examples/demo/enable/basic_move.py
index a76ac8f94..0e3c14cb4 100644
--- a/enable/examples/demo/enable/basic_move.py
+++ b/enable/examples/demo/enable/basic_move.py
@@ -14,7 +14,7 @@
 from traits.api import Float
 
 from enable.api import Component, Pointer, Container
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class Box(Component):
diff --git a/enable/examples/demo/enable/brush_draw.py b/enable/examples/demo/enable/brush_draw.py
index 52b50b34f..f8403d52e 100644
--- a/enable/examples/demo/enable/brush_draw.py
+++ b/enable/examples/demo/enable/brush_draw.py
@@ -12,7 +12,7 @@
 """
 from traits.api import Instance
 
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import (
     Brush, ColorStop, Component, Container, Gradient, RadialGradientBrush
 )
diff --git a/enable/examples/demo/enable/canvas_demo.py b/enable/examples/demo/enable/canvas_demo.py
index 034b53b65..8a4d61ad7 100644
--- a/enable/examples/demo/enable/canvas_demo.py
+++ b/enable/examples/demo/enable/canvas_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Canvas, Viewport
-from enable.examples.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.tools.api import ViewportPanTool
 
 
diff --git a/enable/examples/demo/enable/compass_example.py b/enable/examples/demo/enable/compass_example.py
index 629bcd320..16b44adef 100644
--- a/enable/examples/demo/enable/compass_example.py
+++ b/enable/examples/demo/enable/compass_example.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import OverlayContainer, Compass
-from enable.examples.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 
 
 class Demo(DemoFrame):
diff --git a/enable/examples/demo/enable/container_demo.py b/enable/examples/demo/enable/container_demo.py
index 4497f5e0e..ab0fcd6f4 100644
--- a/enable/examples/demo/enable/container_demo.py
+++ b/enable/examples/demo/enable/container_demo.py
@@ -11,7 +11,7 @@
 from traits.api import Enum, Float, Int, Str, Tuple
 
 from enable.api import ColorTrait
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.tools.api import DragTool
 from kiva.trait_defs.api import KivaFont
 
diff --git a/enable/examples/demo/enable/filled_container_demo.py b/enable/examples/demo/enable/filled_container_demo.py
index 2d23a8109..eeb83ef10 100644
--- a/enable/examples/demo/enable/filled_container_demo.py
+++ b/enable/examples/demo/enable/filled_container_demo.py
@@ -22,7 +22,7 @@
 from traits.api import Any, Enum, Float, Instance, Tuple
 
 from enable.api import Container, Component, Pointer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from kiva.fonttools import str_to_font
 
 
diff --git a/enable/examples/demo/enable/gradient_demo.py b/enable/examples/demo/enable/gradient_demo.py
index afb8a73a0..1309e321d 100644
--- a/enable/examples/demo/enable/gradient_demo.py
+++ b/enable/examples/demo/enable/gradient_demo.py
@@ -26,7 +26,7 @@
 from traits.api import Instance, Int, observe
 from traitsui.api import Item, OKCancelButtons, View
 
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import (
     AbstractOverlay, BaseTool, ColorStop, Component, Gradient,
     LinearGradientBrush, black_color_trait, marker_trait
diff --git a/enable/examples/demo/enable/image_draw.py b/enable/examples/demo/enable/image_draw.py
index 8f6789dd7..05730c000 100644
--- a/enable/examples/demo/enable/image_draw.py
+++ b/enable/examples/demo/enable/image_draw.py
@@ -13,7 +13,7 @@
 import os
 
 from enable.api import ConstraintsContainer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 
 THIS_DIR = os.path.split(__file__)[0]
diff --git a/enable/examples/demo/enable/label_test.py b/enable/examples/demo/enable/label_test.py
index 6fd241e7b..f22c93a51 100644
--- a/enable/examples/demo/enable/label_test.py
+++ b/enable/examples/demo/enable/label_test.py
@@ -9,7 +9,7 @@
 # Thanks for using Enthought open source!
 """ Small demo of the Label component.  """
 
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.label import Label
 
 
diff --git a/enable/examples/demo/enable/latency_demo.py b/enable/examples/demo/enable/latency_demo.py
index 8b15058a7..ae503c1e3 100644
--- a/enable/examples/demo/enable/latency_demo.py
+++ b/enable/examples/demo/enable/latency_demo.py
@@ -16,7 +16,7 @@
 from traits.api import Float
 
 from enable.api import Component, Container, ColorTrait, black_color_trait
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from kiva.api import SWISS, Font
 
 font = Font(family=SWISS)
diff --git a/enable/examples/demo/enable/primitives_demo.py b/enable/examples/demo/enable/primitives_demo.py
index 6366a87e9..c7cc9cd3d 100644
--- a/enable/examples/demo/enable/primitives_demo.py
+++ b/enable/examples/demo/enable/primitives_demo.py
@@ -16,7 +16,7 @@
     DragLine, DragPolygon, DragSegment, DrawingCanvas, DrawingCanvasToolbar,
     DrawingTool, PointLine, PointPolygon, ToolbarButton
 )
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class ResetButton(ToolbarButton):
diff --git a/enable/examples/demo/enable/resize_tool_demo.py b/enable/examples/demo/enable/resize_tool_demo.py
index 303456fcf..bbafa90e0 100644
--- a/enable/examples/demo/enable/resize_tool_demo.py
+++ b/enable/examples/demo/enable/resize_tool_demo.py
@@ -11,7 +11,7 @@
 This demonstrates the resize tool.
 """
 from enable.api import Component, Container
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.tools.resize_tool import ResizeTool
 
 
diff --git a/enable/examples/demo/enable/scrollbar_demo.py b/enable/examples/demo/enable/scrollbar_demo.py
index 6ee46cae7..989f79cbf 100644
--- a/enable/examples/demo/enable/scrollbar_demo.py
+++ b/enable/examples/demo/enable/scrollbar_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Container, Label, NativeScrollBar
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class Demo(DemoFrame):
diff --git a/enable/examples/demo/enable/scrolled_canvas_demo.py b/enable/examples/demo/enable/scrolled_canvas_demo.py
index 5bce37900..c35bba079 100644
--- a/enable/examples/demo/enable/scrolled_canvas_demo.py
+++ b/enable/examples/demo/enable/scrolled_canvas_demo.py
@@ -19,7 +19,7 @@
 from numpy import array
 
 from enable.api import Canvas, Viewport, Scrolled
-from enable.examples.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.primitives.api import Box
 from enable.tools.api import ViewportPanTool
 
diff --git a/enable/examples/demo/enable/scrolled_demo.py b/enable/examples/demo/enable/scrolled_demo.py
index cbe31ca5c..139aa904d 100644
--- a/enable/examples/demo/enable/scrolled_demo.py
+++ b/enable/examples/demo/enable/scrolled_demo.py
@@ -14,7 +14,7 @@
 from traits.api import Enum, Float, Instance, Tuple
 
 from enable.api import Component, Scrolled, Container, Pointer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class Circle(Component):
diff --git a/enable/examples/demo/enable/shapes/run.py b/enable/examples/demo/enable/shapes/run.py
index 5d39e24b2..12cd51a78 100644
--- a/enable/examples/demo/enable/shapes/run.py
+++ b/enable/examples/demo/enable/shapes/run.py
@@ -13,7 +13,7 @@
 
 # Enthought library imports.
 from enable.api import Container
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 # Local imports
 from enable.examples.demo.enable.shapes.api import Box, Circle
diff --git a/enable/examples/demo/enable/slider_example.py b/enable/examples/demo/enable/slider_example.py
index 6de82ff49..639dcf857 100644
--- a/enable/examples/demo/enable/slider_example.py
+++ b/enable/examples/demo/enable/slider_example.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import OverlayContainer, Slider
-from enable.examples.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 
 
 class Demo(DemoFrame):
diff --git a/enable/examples/demo/enable/stacked_container_demo.py b/enable/examples/demo/enable/stacked_container_demo.py
index 9e0f73402..f272df2e7 100644
--- a/enable/examples/demo/enable/stacked_container_demo.py
+++ b/enable/examples/demo/enable/stacked_container_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Container, Window, TextField
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.stacked_container import VStackedContainer, HStackedContainer
 
 size = (240, 240)
diff --git a/enable/examples/demo/enable/text_field_demo.py b/enable/examples/demo/enable/text_field_demo.py
index 7531ee979..a32dfd49e 100644
--- a/enable/examples/demo/enable/text_field_demo.py
+++ b/enable/examples/demo/enable/text_field_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Container, TextField
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 size = (500, 400)
diff --git a/enable/examples/demo/enable/text_grid_demo.py b/enable/examples/demo/enable/text_grid_demo.py
index a60d4da63..abb08efe4 100644
--- a/enable/examples/demo/enable/text_grid_demo.py
+++ b/enable/examples/demo/enable/text_grid_demo.py
@@ -10,7 +10,7 @@
 from numpy import array
 
 from enable.api import Container
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.text_grid import TextGrid
 
 size = (400, 100)
diff --git a/enable/examples/demo/enable/tools/button_tool.py b/enable/examples/demo/enable/tools/button_tool.py
index afb563721..93105a3e7 100644
--- a/enable/examples/demo/enable/tools/button_tool.py
+++ b/enable/examples/demo/enable/tools/button_tool.py
@@ -17,7 +17,7 @@
 
 from enable.api import Container, transparent_color
 from enable.colors import ColorTrait
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.api import Box
 from enable.tools.button_tool import ButtonTool
 
diff --git a/enable/examples/demo/enable/tools/drop_tool.py b/enable/examples/demo/enable/tools/drop_tool.py
index 2d1ea27d0..e2565f8dc 100644
--- a/enable/examples/demo/enable/tools/drop_tool.py
+++ b/enable/examples/demo/enable/tools/drop_tool.py
@@ -11,7 +11,7 @@
 This demonstrates the use of the drop tool.
 """
 
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import Component, Container, Label
 from enable.tools.base_drop_tool import BaseDropTool
 
diff --git a/enable/examples/demo/enable/tools/pyface/context_menu.py b/enable/examples/demo/enable/tools/pyface/context_menu.py
index f88d31789..088a1270b 100644
--- a/enable/examples/demo/enable/tools/pyface/context_menu.py
+++ b/enable/examples/demo/enable/tools/pyface/context_menu.py
@@ -12,7 +12,7 @@
 component is created and added to a container.
 """
 
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import Component, Container
 from enable.tools.pyface.context_menu_tool import ContextMenuTool
 
diff --git a/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py b/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py
index 7ef04b93e..42aefd273 100644
--- a/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py
+++ b/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py
@@ -27,7 +27,7 @@
 from traits.api import Instance
 
 from enable.api import Container, Window, KeySpec
-from enable.examples.example_application import DemoApplication, demo_main
+from enable.examples._example_application import DemoApplication, demo_main
 from enable.primitives.api import Box
 from enable.tools.pyface.api import MoveCommandTool, UndoTool
 
diff --git a/enable/examples/demo/enable/view_bounds_test.py b/enable/examples/demo/enable/view_bounds_test.py
index 29d7f993f..cb43d3997 100644
--- a/enable/examples/demo/enable/view_bounds_test.py
+++ b/enable/examples/demo/enable/view_bounds_test.py
@@ -13,7 +13,7 @@
 
 from enable.api import Container, Component, Scrolled
 from enable.base import empty_rectangle, intersect_bounds
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class Box(Component):
diff --git a/enable/examples/demo/enable/zoomed_event_demo.py b/enable/examples/demo/enable/zoomed_event_demo.py
index 368cef52b..09f4973ac 100644
--- a/enable/examples/demo/enable/zoomed_event_demo.py
+++ b/enable/examples/demo/enable/zoomed_event_demo.py
@@ -13,7 +13,7 @@
 from traits.api import Float
 
 from enable.api import AbstractOverlay, Canvas, Viewport, ColorTrait, Scrolled
-from enable.examples.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.primitives.api import Box
 from enable.tools.api import ViewportPanTool
 
diff --git a/enable/text_field_grid.py b/enable/text_field_grid.py
index cde28d90d..310c1edf3 100644
--- a/enable/text_field_grid.py
+++ b/enable/text_field_grid.py
@@ -188,7 +188,7 @@ def _cells_changed(self, new):
 if __name__ == "__main__":
     from enable.wx_backend.api import Window
     from enable.api import Container
-    from enable.examples.example_support import DemoFrame, demo_main
+    from enable.examples._example_support import DemoFrame, demo_main
 
     class MyFrame(DemoFrame):
         def _create_window(self):
diff --git a/kiva/examples/kiva/compiled_path.py b/kiva/examples/kiva/compiled_path.py
index de27ebcc0..193f276b0 100644
--- a/kiva/examples/kiva/compiled_path.py
+++ b/kiva/examples/kiva/compiled_path.py
@@ -16,7 +16,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.api import STROKE
 from kiva.image import GraphicsContext, CompiledPath
diff --git a/kiva/examples/kiva/dash.py b/kiva/examples/kiva/dash.py
index ec1342161..2bf4513e5 100644
--- a/kiva/examples/kiva/dash.py
+++ b/kiva/examples/kiva/dash.py
@@ -13,7 +13,7 @@
 import numpy
 
 from enable.api import ConstraintsContainer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.agg import GraphicsContextArray
diff --git a/kiva/examples/kiva/ellipse.py b/kiva/examples/kiva/ellipse.py
index bbec4b519..d3a304a52 100644
--- a/kiva/examples/kiva/ellipse.py
+++ b/kiva/examples/kiva/ellipse.py
@@ -12,7 +12,7 @@
 from scipy import pi
 
 from enable.api import ConstraintsContainer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/gradient.py b/kiva/examples/kiva/gradient.py
index 35f364994..eb156201d 100644
--- a/kiva/examples/kiva/gradient.py
+++ b/kiva/examples/kiva/gradient.py
@@ -12,7 +12,7 @@
 from numpy import array, pi
 
 from enable.api import ConstraintsContainer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.image import GraphicsContext
diff --git a/kiva/examples/kiva/qt4_simple.py b/kiva/examples/kiva/qt4_simple.py
index 555cfd0da..cdc90be85 100644
--- a/kiva/examples/kiva/qt4_simple.py
+++ b/kiva/examples/kiva/qt4_simple.py
@@ -16,7 +16,7 @@
 
 ETSConfig.toolkit = "qt4.qpainter"
 
-from enable.examples.example_canvas import Canvas
+from enable.examples._example_canvas import Canvas
 
 try:
     from pyface.qt import QtGui
diff --git a/kiva/examples/kiva/rect.py b/kiva/examples/kiva/rect.py
index dc37caefe..ac1ab4ecb 100644
--- a/kiva/examples/kiva/rect.py
+++ b/kiva/examples/kiva/rect.py
@@ -10,7 +10,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/simple.py b/kiva/examples/kiva/simple.py
index 52356a920..0b877775f 100644
--- a/kiva/examples/kiva/simple.py
+++ b/kiva/examples/kiva/simple.py
@@ -10,7 +10,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.image import GraphicsContext
diff --git a/kiva/examples/kiva/simple2.py b/kiva/examples/kiva/simple2.py
index 529d9c95c..94828d01b 100644
--- a/kiva/examples/kiva/simple2.py
+++ b/kiva/examples/kiva/simple2.py
@@ -10,7 +10,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/star.py b/kiva/examples/kiva/star.py
index 010b04301..a040be1c5 100644
--- a/kiva/examples/kiva/star.py
+++ b/kiva/examples/kiva/star.py
@@ -12,7 +12,7 @@
 from scipy import pi
 
 from enable.api import ConstraintsContainer
-from enable.examples.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/star1.py b/kiva/examples/kiva/star1.py
index 57f419a22..acaf6743d 100644
--- a/kiva/examples/kiva/star1.py
+++ b/kiva/examples/kiva/star1.py
@@ -13,7 +13,7 @@
 from traitsui.api import Item, View
 
 from enable.api import ConstraintsContainer, Component, ComponentEditor
-from enable.examples.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.image import GraphicsContext
diff --git a/kiva/examples/kiva/ui_gradient.py b/kiva/examples/kiva/ui_gradient.py
index 619f8cdfc..97bf68b63 100644
--- a/kiva/examples/kiva/ui_gradient.py
+++ b/kiva/examples/kiva/ui_gradient.py
@@ -10,7 +10,7 @@
 import numpy as np
 
 from enable.api import Component
-from enable.examples.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 
 
 class MyCanvas(Component):
diff --git a/kiva/examples/kiva/ui_text.py b/kiva/examples/kiva/ui_text.py
index b7d8bc10f..cfcfb058f 100644
--- a/kiva/examples/kiva/ui_text.py
+++ b/kiva/examples/kiva/ui_text.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Component
-from enable.examples.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 def glyph_a(gc):

From ff9f8196881f20975507474acfec0acda25f8209 Mon Sep 17 00:00:00 2001
From: Aaron Ayres <aayres@enthought.com>
Date: Mon, 21 Jun 2021 07:53:08 -0500
Subject: [PATCH 5/6] update warning message / module docstrings

---
 enable/example_application.py | 13 ++++++++-----
 enable/example_canvas.py      | 14 ++++++++------
 enable/example_support.py     | 13 ++++++++-----
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/enable/example_application.py b/enable/example_application.py
index 0af85b957..11898f715 100644
--- a/enable/example_application.py
+++ b/enable/example_application.py
@@ -11,9 +11,10 @@
 Example Application Support
 ===========================
 
-This module provides a simple Pyface application that can be used by examples
-in places where a DemoFrame is insufficient. Note this has been moved to
-sit in enable/examples.  This module is kept for backwards compatibility.
+This module is meant for internal use only and it is not meant for use in
+library code. Importing from this module is deprecated and it will be removed
+in Enable 6.0. We highly recommend that you update your code and vendorize what
+is necessary.
 
 """
 import warnings
@@ -21,8 +22,10 @@
 from enable.examples._example_application import DemoApplication, demo_main
 
 warnings.warn(
-    "Importing from this module is deprecated, and this module will be"
-    " removed in a future release.",
+    "This module is meant for internal use only and it is not meant for use in"
+    " library code. Importing from this module is deprecated and it will be"
+    " removed in Enable 6.0. We highly recommend that you update your code and"
+    " vendorize what is necessary.",
     DeprecationWarning,
     stacklevel=2
 )
diff --git a/enable/example_canvas.py b/enable/example_canvas.py
index 290657e88..b9a5d9ae1 100644
--- a/enable/example_canvas.py
+++ b/enable/example_canvas.py
@@ -8,18 +8,20 @@
 #
 # Thanks for using Enthought open source!
 """
-A suitable replacement for the old Canvas class in Kiva. 
-Note this has been moved to sit in enable/examples.  This module is kept for
-backwards compatibility.
-
+This module is meant for internal use only and it is not meant for use in
+library code. Importing from this module is deprecated and it will be removed
+in Enable 6.0. We highly recommend that you update your code and vendorize what
+is necessary.
 """
 import warnings
 
 from enable.examples._example_canvas import Canvas
 
 warnings.warn(
-    "Importing from this module is deprecated, and this module will be"
-    " removed in a future release.",
+    "This module is meant for internal use only and it is not meant for use in"
+    " library code. Importing from this module is deprecated and it will be"
+    " removed in Enable 6.0. We highly recommend that you update your code and"
+    " vendorize what is necessary.",
     DeprecationWarning,
     stacklevel=2
 )
diff --git a/enable/example_support.py b/enable/example_support.py
index a1b4222e8..eac1173bf 100644
--- a/enable/example_support.py
+++ b/enable/example_support.py
@@ -8,17 +8,20 @@
 #
 # Thanks for using Enthought open source!
 """
-Support class that wraps up the boilerplate toolkit calls that virtually all
-demo programs have to use.  Note this has been moved to sit in enable/examples.
-This module is kept for backwards compatibility.
+This module is meant for internal use only and it is not meant for use in
+library code. Importing from this module is deprecated and it will be removed
+in Enable 6.0. We highly recommend that you update your code and vendorize what
+is necessary.
 """
 import warnings
 
 from enable.examples._example_support import DemoFrame, demo_main
 
 warnings.warn(
-    "Importing from this module is deprecated, and this module will be"
-    " removed in a future release.",
+    "This module is meant for internal use only and it is not meant for use in"
+    " library code. Importing from this module is deprecated and it will be"
+    " removed in Enable 6.0. We highly recommend that you update your code and"
+    " vendorize what is necessary.",
     DeprecationWarning,
     stacklevel=2
 )

From 51cad7ab8ec0166478af5ac4afb41cfe06a07693 Mon Sep 17 00:00:00 2001
From: Aaron Ayres <aayres@enthought.com>
Date: Mon, 21 Jun 2021 08:30:05 -0500
Subject: [PATCH 6/6] remove now unneeded code block

---
 enable/examples/_example_support.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/enable/examples/_example_support.py b/enable/examples/_example_support.py
index 156d46f3a..892576d54 100644
--- a/enable/examples/_example_support.py
+++ b/enable/examples/_example_support.py
@@ -18,22 +18,6 @@
 
 from enable.api import Component, ComponentEditor
 
-# FIXME - it should be enough to do the following import, but because of the
-# PyQt/traits problem (see below) we can't because it would drag in traits too
-# early.  Until it is fixed we just assume wx if we can import it.
-# Force the selection of a valid toolkit.
-# import enable.toolkit
-if not ETSConfig.toolkit:
-    for toolkit, toolkit_module in (("wx", "wx"), ("qt4", "PyQt4")):
-        try:
-            exec("import " + toolkit_module)
-            ETSConfig.toolkit = toolkit
-            break
-        except ImportError:
-            pass
-    else:
-        raise RuntimeError("Can't load wx or qt4 backend for Chaco.")
-
 
 class DemoFrame(HasTraits):