Browse files

fixed imports to new locations

  • Loading branch information...
1 parent 4c25342 commit a5fa49c43f91153dad2bcca54624cdb63f0b8550 Ilan Schnell committed Apr 21, 2011
Showing with 377 additions and 380 deletions.
  1. +1 −1 MANIFEST.in
  2. +3 −3 TODO.txt
  3. +7 −7 docs/CHANGES.txt
  4. +1 −1 docs/kiva/agg/interface.txt
  5. +1 −1 docs/source/kiva.rst
  6. +2 −2 enable/base.py
  7. +1 −1 enable/canvas.py
  8. +3 −3 enable/component.py
  9. +2 −2 enable/component_editor.py
  10. +1 −1 enable/container.py
  11. +1 −1 enable/controls.py
  12. +2 −2 enable/drawing/drag_box.py
  13. +1 −1 enable/drawing/drag_line.py
  14. +2 −2 enable/drawing/drag_polygon.py
  15. +1 −1 enable/drawing/drag_segment.py
  16. +3 −3 enable/drawing/drawing_canvas.py
  17. +1 −1 enable/drawing/drawing_tool.py
  18. +1 −1 enable/drawing/point_line.py
  19. +1 −1 enable/drawing/point_polygon.py
  20. +1 −1 enable/enable_traits.py
  21. +1 −1 enable/events.py
  22. +1 −1 enable/example_canvas.py
  23. +1 −1 enable/example_support.py
  24. +1 −1 enable/gl_graphics_context.py
  25. +2 −2 enable/graphics_context.py
  26. +2 −2 enable/interactor.py
  27. +2 −2 enable/kiva/agg/src/graphics_context.i
  28. +1 −1 enable/kiva/agg/src/hit_test.i
  29. +1 −1 enable/kiva/agg/tests/affine_matrix_test_case.py
  30. +1 −1 enable/kiva/agg/tests/clip_to_rect_test_case.py
  31. +1 −1 enable/kiva/agg/tests/compiled_path_test_case.py
  32. +2 −2 enable/kiva/agg/tests/font_loading_test.py
  33. +1 −1 enable/kiva/agg/tests/gcmemtest.py
  34. +2 −2 enable/kiva/agg/tests/graphics_context_test_case.py
  35. +1 −1 enable/kiva/agg/tests/join_stroke_path_test_case.py
  36. +1 −1 enable/kiva/agg/tests/points_in_polygon_test_case.py
  37. +1 −1 enable/kiva/agg/tests/rgba_test_case.py
  38. +1 −1 enable/kiva/agg/tests/stroke_path_test_case.py
  39. +1 −1 enable/kiva/agg/tests/test_graphics_context_system.py
  40. +1 −1 enable/kiva/agg/tests/test_save.py
  41. +2 −2 enable/kiva/agg/tests/unicode_font_test_case.py
  42. +1 −1 enable/kiva/basecore2d.py
  43. +1 −1 enable/kiva/cairo.py
  44. +1 −1 enable/kiva/fonttools/font.py
  45. +6 −6 enable/kiva/fonttools/fontTools/ttLib/__init__.py
  46. +3 −3 enable/kiva/fonttools/fontTools/ttLib/macUtils.py
  47. +6 −6 enable/kiva/fonttools/fontTools/ttLib/sfnt.py
  48. +2 −2 enable/kiva/fonttools/fontTools/ttLib/tables/DefaultTable.py
  49. +2 −2 enable/kiva/fonttools/fontTools/ttLib/tables/_n_a_m_e.py
  50. +1 −1 enable/kiva/fonttools/font_manager.py
  51. +1 −1 enable/kiva/pdf.py
  52. +1 −1 enable/kiva/qpainter.py
  53. +2 −2 enable/kiva/quartz/ABCGI.pyx
  54. +3 −3 enable/kiva/readme.txt
  55. +1 −1 enable/kiva/tests/affine_test_case.py
  56. +3 −3 enable/kiva/tests/basecore2d_test_case.py
  57. +1 −1 enable/kiva/tests/macport_test.py
  58. +3 −3 enable/kiva/trait_defs/kiva_font_trait.py
  59. +5 −5 enable/kiva/trait_defs/ui/wx/kiva_font_editor.py
  60. +2 −2 enable/label.py
  61. +2 −2 enable/markers.py
  62. +1 −1 enable/new_abstract_component.py
  63. +1 −1 enable/null/cairo.py
  64. +1 −1 enable/null/image.py
  65. +2 −2 enable/null/pdf.py
  66. +2 −2 enable/null/ps.py
  67. +1 −1 enable/null/qpainter.py
  68. +2 −2 enable/null/quartz.py
  69. +1 −1 enable/null/svg.py
  70. +2 −2 enable/primitives/annotater.py
  71. +3 −3 enable/primitives/box.py
  72. +3 −3 enable/primitives/line.py
  73. +4 −4 enable/primitives/polygon.py
  74. +3 −3 enable/primitives/shape.py
  75. +3 −3 enable/pyglet_backend/window.py
  76. +2 −2 enable/qt4/base_window.py
  77. +1 −1 enable/qt4/cairo.py
  78. +2 −2 enable/qt4/gl.py
  79. +2 −2 enable/qt4/image.py
  80. +1 −1 enable/qt4/qpainter.py
  81. +1 −1 enable/qt4/scrollbar.py
  82. +6 −6 enable/savage/compliance/comparator.py
  83. +1 −1 enable/savage/compliance/crosshair.py
  84. +2 −2 enable/savage/compliance/svg_component.py
  85. +2 −2 enable/savage/compliance/viewer.py
  86. +5 −5 enable/savage/svg/backends/kiva/renderer.py
  87. +1 −1 enable/savage/svg/backends/wx/__init__.py
  88. +1 −1 enable/savage/svg/backends/wx/renderer.py
  89. +1 −1 enable/savage/svg/css/colour.py
  90. +1 −1 enable/savage/svg/css/transform.py
  91. +1 −1 enable/savage/svg/document.py
  92. +1 −1 enable/savage/svg/tests/css/test_atrule.py
  93. +1 −1 enable/savage/svg/tests/css/test_block.py
  94. +1 −1 enable/savage/svg/tests/css/test_color.py
  95. +1 −1 enable/savage/svg/tests/css/test_identifier.py
  96. +1 −1 enable/savage/svg/tests/css/test_transform.py
  97. +1 −1 enable/savage/svg/tests/css/test_values.py
  98. +1 −1 enable/savage/svg/tests/test_attributes.py
  99. +2 −2 enable/savage/svg/tests/test_document.py
  100. +1 −1 enable/savage/svg/tests/test_pathdata.py
  101. +1 −1 enable/savage/trait_defs/ui/qt4/svg_editor.py
  102. +1 −1 enable/savage/trait_defs/ui/svg_button_editor.py
  103. +1 −1 enable/savage/trait_defs/ui/svg_editor.py
  104. +1 −1 enable/savage/trait_defs/ui/toolkit.py
  105. +3 −3 enable/savage/trait_defs/ui/wx/kiva_render_panel.py
  106. +2 −2 enable/savage/trait_defs/ui/wx/svg_button_editor.py
  107. +2 −2 enable/savage/trait_defs/ui/wx/svg_editor.py
  108. +1 −1 enable/savage/trait_defs/ui/wx/wx_render_panel.py
  109. +1 −1 enable/slider.py
  110. +1 −1 enable/tests/component_test_case.py
  111. +1 −1 enable/tests/container_test_case.py
  112. +1 −1 enable/tests/coordinate_box_test_case.py
  113. +1 −1 enable/tests/event_transform_test_case.py
  114. +1 −1 enable/tests/viewport_test_case.py
  115. +4 −4 enable/text_field_grid.py
  116. +2 −2 enable/text_field_style.py
  117. +1 −1 enable/text_grid.py
  118. +1 −1 enable/toolkit.py
  119. +1 −1 enable/tools/drag_tool.py
  120. +1 −1 enable/tools/hover_tool.py
  121. +1 −1 enable/tools/tool_history_mixin.py
  122. +3 −3 enable/tools/toolbars/toolbar_buttons.py
  123. +2 −2 enable/tools/toolbars/viewport_toolbar.py
  124. +2 −2 enable/tools/traits_tool.py
  125. +1 −1 enable/tools/viewport_pan_tool.py
  126. +3 −3 enable/tools/viewport_zoom_tool.py
  127. +3 −3 enable/trait_defs/ui/wx/enable_rgba_color_editor.py
  128. +5 −5 enable/trait_defs/ui/wx/rgba_color_editor.py
  129. +3 −3 enable/viewport.py
  130. +2 −2 enable/vtk_backend/vtk_window.py
  131. +2 −2 enable/wx/base_window.py
  132. +1 −1 enable/wx/cairo.py
  133. +2 −2 enable/wx/gl.py
  134. +2 −2 enable/wx/image.py
  135. +2 −2 enable/wx/quartz.py
  136. +1 −1 enable/wx/scrollbar.py
  137. +2 −2 examples/enable/basic_draw.py
  138. +2 −2 examples/enable/basic_move.py
  139. +4 −4 examples/enable/canvas_demo.py
  140. +2 −2 examples/enable/compass_example.py
  141. +1 −1 examples/enable/component_demo.py
  142. +3 −3 examples/enable/container_demo.py
  143. +2 −2 examples/enable/filled_container_demo.py
  144. +3 −3 examples/enable/label_test.py
  145. +3 −3 examples/enable/latency_demo.py
  146. +3 −3 examples/enable/primitives_demo.py
  147. +2 −2 examples/enable/scrollbar_demo.py
  148. +4 −4 examples/enable/scrolled_canvas_demo.py
  149. +2 −2 examples/enable/scrolled_demo.py
  150. +1 −1 examples/enable/shapes/box.py
  151. +1 −1 examples/enable/shapes/circle.py
  152. +2 −2 examples/enable/shapes/run.py
  153. +2 −2 examples/enable/slider_example.py
  154. +4 −4 examples/enable/stacked_container_demo.py
  155. +2 −2 examples/enable/text_field_demo.py
  156. +3 −3 examples/enable/text_grid_demo.py
  157. +3 −3 examples/enable/view_bounds_test.py
  158. +2 −2 examples/enable/vtk_example.py
  159. +3 −3 examples/enable/zoomed_event_demo.py
  160. +2 −2 examples/kiva/agg/examples/benchmark.py
  161. +2 −2 examples/kiva/agg/examples/compiled_path.py
  162. +2 −2 examples/kiva/agg/examples/conv.py
  163. +1 −1 examples/kiva/agg/examples/dash.py
  164. +1 −1 examples/kiva/agg/examples/lion.py
  165. +1 −1 examples/kiva/agg/examples/lion_data.py
  166. +1 −1 examples/kiva/agg/examples/polygon_hit_test.py
  167. +1 −1 examples/kiva/agg/examples/rect.py
  168. +2 −2 examples/kiva/agg/examples/simple.py
  169. +1 −1 examples/kiva/agg/examples/simple2.py
  170. +1 −1 examples/kiva/agg/examples/simple_clip.py
  171. +1 −1 examples/kiva/agg/examples/star.py
  172. +1 −1 examples/kiva/agg/examples/star1.py
  173. +1 −1 examples/kiva/agg/examples/star2.py
  174. +2 −2 examples/kiva/agg/examples/star_path.py
  175. +1 −1 examples/kiva/agg/examples/sub_path.py
  176. +3 −3 examples/kiva/agg/examples/text_ex.py
  177. +2 −2 examples/kiva/compiled_path.py
  178. +2 −2 examples/kiva/dash.py
  179. +3 −3 examples/kiva/dummy.py
  180. +1 −1 examples/kiva/ellipse.py
  181. +3 −3 examples/kiva/gradient.py
  182. +1 −1 examples/kiva/pdf_arcs.py
  183. +2 −2 examples/kiva/pyglet_gl.py
  184. +1 −1 examples/kiva/qt4_simple.py
  185. +1 −1 examples/kiva/rect.py
  186. +2 −2 examples/kiva/simple.py
  187. +1 −1 examples/kiva/simple2.py
  188. +1 −1 examples/kiva/simple_clip.py
  189. +1 −1 examples/kiva/star.py
  190. +2 −2 examples/kiva/star1.py
  191. +2 −2 examples/kiva/star_path.py
  192. +1 −1 examples/kiva/sub_path.py
  193. +1 −1 examples/kiva/ui_gradient.py
  194. +1 −1 examples/kiva/ui_text.py
  195. +1 −1 examples/savage/button_demo.py
  196. +5 −5 examples/savage/buttons_on_canvas.py
  197. +5 −5 examples/savage/static_image.py
  198. +1 −1 examples/savage/toggle_demo.py
  199. +4 −3 image_LICENSE.txt
  200. +2 −2 integrationtests/kiva/agg/image_test_case.py
  201. +1 −1 integrationtests/kiva/agg/test_arc.py
  202. +1 −1 integrationtests/kiva/agg/test_draw_dash.py
  203. +2 −2 integrationtests/kiva/agg/test_image3.py
  204. +5 −9 setup.py
View
2 MANIFEST.in
@@ -1 +1 @@
-include enthought/kiva/mac/macport*.cpp
+include enable/kiva/mac/macport*.cpp
View
6 TODO.txt
@@ -1,8 +1,8 @@
* Clean-up the failing import of enthought.freetype in
- enthought.kiva.trait_defs.ui.wx.kiva_font_editor.
+ enable.kiva.trait_defs.ui.wx.kiva_font_editor.
-* Clean-up imports of enthought.enable (I mean NOT enthought.enable2) done
+* Clean-up imports of enable (I mean NOT enable2) done
in:
- enthought/enable2/traits/ui/wx/enable_rgba_color_editor.py
+ enable2/traits/ui/wx/enable_rgba_color_editor.py
* Clean-up direct imports of traitsui.wx
View
14 docs/CHANGES.txt
@@ -105,7 +105,7 @@ Enhancements
------------
* Updated freetype to 2.3.12. This makes our text look prettier, and also fixes some compatibility issues with OS X 10.6.
- * Moved Shape from examples into enthought.enable.primitives
+ * Moved Shape from examples into enable.primitives
* Improved ability to find the Qt SVG IconEngine for the SVGButtonEditor
* Improved painting in Wx by as much as 30%
* Added repeat and reflect gradient fill methods
@@ -124,15 +124,15 @@ Fixes
One final note is that the "enable2" legacy backwards compatibility package will
be removed by the next release. If you have any code that imports from
-"enthought.enable2" and the DeprecationWarnings haven't been sufficiently
+"enable2" and the DeprecationWarnings haven't been sufficiently
motivating thus far, please heed them and change your imports to use
-"enthought.enable"!
+"enable"!
Enable 3.2.0 (July 15th, 2009)
==============================
-enthought.enable Enhancements
+enable Enhancements
-----------------------------
* Added Slider and Compass widgets
@@ -156,7 +156,7 @@ enthought.enable Enhancements
* Adding a "fixed_preferred_size" trait to Components, so that relative size preferences can be expressed amongst different components in a container
-enthought.enable Fixes
+enable Fixes
----------------------
* Improved the backend selection to match the Traits UI backend unless ETSConfig.enable_toolkit is explicitly set
@@ -170,13 +170,13 @@ enthought.enable Fixes
* Fixed backend_cairo's get_text_extent() implementation to match other backends
-enthought.kiva Enhancements
+enable.kiva Enhancements
---------------------------
* Added basic gradients to Kiva
-enthought.kiva Fixes
+enable.kiva Fixes
--------------------
* Fixed Python 2.6 datatype errors
View
2 docs/kiva/agg/interface.txt
@@ -3,7 +3,7 @@ Kiva Interface Quick Reference (AGG backend)
This document is a summary of the classes and functions available in
Kiva. More specifically, it describes some of the details of the
-enthought.kiva.agg backend, including enumerated types and helper classes.
+enable.kiva.agg backend, including enumerated types and helper classes.
-------------------------------------------
Primitive types
View
2 docs/source/kiva.rst
@@ -3,7 +3,7 @@ Kiva Interface Quick Reference
This document is a summary of the classes and functions available in
Kiva. More specifically, it describes some of the details of the
-enthought.kiva.agg backend, including enumerated types and helper classes.
+enable.kiva.agg backend, including enumerated types and helper classes.
Types
-----
View
4 enable/base.py
@@ -28,9 +28,9 @@
# Enthought library imports
from traits.api import TraitError
-from enthought.kiva.constants import DEFAULT, DECORATIVE, ROMAN, SCRIPT, SWISS,\
+from enable.kiva.constants import DEFAULT, DECORATIVE, ROMAN, SCRIPT, SWISS,\
MODERN, NORMAL, BOLD, ITALIC
-from enthought.kiva.fonttools import Font
+from enable.kiva.fonttools import Font
from colors import color_table, transparent_color
View
2 enable/canvas.py
@@ -3,7 +3,7 @@
# Enthought library imports
from traits.api import Bool, Trait, Tuple, List
-from enthought.kiva.constants import FILL
+from enable.kiva.constants import FILL
# Local relative imports
View
6 enable/component.py
@@ -4,10 +4,10 @@
from traits.api \
import Any, Bool, Delegate, Enum, Float, Instance, Int, List, \
Property, Str, Trait
-from enthought.kiva.constants import FILL, STROKE
+from enable.kiva.constants import FILL, STROKE
try:
- from enthought.kiva.gl import GraphicsContext as GraphicsContextGL
+ from enable.kiva.gl import GraphicsContext as GraphicsContextGL
except (ImportError, TypeError):
class GraphicsContextGL(object):
pass
@@ -62,7 +62,7 @@ class Component(CoordinateBox, Interactor):
window = Property # Instance("Window")
# The list of viewport that are viewing this component
- viewports = List(Instance("enthought.enable.viewport.Viewport"))
+ viewports = List(Instance("enable.viewport.Viewport"))
#------------------------------------------------------------------------
View
4 enable/component_editor.py
@@ -6,8 +6,8 @@
# (c) Copyright 2007 by Enthought, Inc.
#----------------------------------------------------------------------------
-from enthought.enable.colors import ColorTrait
-from enthought.enable.window import Window
+from enable.colors import ColorTrait
+from enable.window import Window
from traits.etsconfig.api import ETSConfig
View
2 enable/container.py
@@ -4,7 +4,7 @@
import warnings
# Enthought library imports
-from enthought.kiva import affine
+from enable.kiva import affine
from traits.api import Any, Bool, Enum, HasTraits, Instance, List, \
Property, Tuple
View
2 enable/controls.py
@@ -19,7 +19,7 @@
import os.path
# Enthought library imports
-from enthought.enable.colors import ColorTrait
+from enable.colors import ColorTrait
from traits.api import Bool, Delegate, HasTraits, Str, Trait, \
TraitPrefixList
from traitsui.api import View, Group
View
4 enable/drawing/drag_box.py
@@ -15,8 +15,8 @@
# Major packages.
# Enthought library imports
-from enthought.enable.primitives.api import Box
-from enthought.enable.enable_traits import Pointer
+from enable.primitives.api import Box
+from enable.enable_traits import Pointer
from traits.api import Event, Float, Trait, Tuple
# Application specific imports.
View
2 enable/drawing/drag_line.py
@@ -1,6 +1,6 @@
""" A drag drawn line. """
-from enthought.enable.api import Line
+from enable.api import Line
from traits.api import Instance
from drawing_tool import DrawingTool
View
4 enable/drawing/drag_polygon.py
@@ -1,7 +1,7 @@
""" A drag drawn polygon. """
-from enthought.enable.primitives.api import Polygon
-from enthought.enable.api import Pointer
+from enable.primitives.api import Polygon
+from enable.api import Pointer
from pyface.action.api import MenuManager
from traits.api import Delegate, Instance
View
2 enable/drawing/drag_segment.py
@@ -8,7 +8,7 @@
#-----------------------------------------------------------------------------
# Enthought library imports
-from enthought.enable.api import Line, Pointer
+from enable.api import Line, Pointer
from traits.api import Event, Instance
from drawing_tool import DrawingTool
View
6 enable/drawing/drawing_canvas.py
@@ -1,7 +1,7 @@
-from enthought.enable.api import Container, Component, ColorTrait
-from enthought.kiva.constants import FILL, FILL_STROKE
-from enthought.kiva.trait_defs.kiva_font_trait import KivaFont
+from enable.api import Container, Component, ColorTrait
+from enable.kiva.constants import FILL, FILL_STROKE
+from enable.kiva.trait_defs.kiva_font_trait import KivaFont
from traits.api import Any, Bool, Delegate, Enum, Instance, Int, List, Str
View
2 enable/drawing/drawing_tool.py
@@ -1,6 +1,6 @@
from traits.api import Enum
-from enthought.enable.api import Component
+from enable.api import Component
class DrawingTool(Component):
View
2 enable/drawing/point_line.py
@@ -1,6 +1,6 @@
""" A point-to-point drawn polygon. """
-from enthought.enable.api import cursor_style_trait, Line
+from enable.api import cursor_style_trait, Line
from traits.api import Event, Int, Instance
from drawing_tool import DrawingTool
View
2 enable/drawing/point_polygon.py
@@ -1,7 +1,7 @@
""" A point-to-point drawn polygon. """
# Enthought library imports.
-from enthought.enable.primitives.api import Polygon
+from enable.primitives.api import Polygon
from traits.api import Int, Instance
from drawing_tool import DrawingTool
View
2 enable/enable_traits.py
@@ -7,7 +7,7 @@
from types import ListType, TupleType
# Enthought library imports
-from enthought.kiva.trait_defs.kiva_font_trait import KivaFont
+from enable.kiva.trait_defs.kiva_font_trait import KivaFont
from traits.api import Trait, Range, TraitPrefixList, TraitPrefixMap, \
List, TraitFactory
from traitsui.api import ImageEnumEditor, EnumEditor
View
2 enable/events.py
@@ -8,7 +8,7 @@
from numpy import array, dot
# Enthought imports
-from enthought.kiva import affine
+from enable.kiva import affine
from traits.api import (Any, Bool, Float, HasTraits, Int,
Event, List, ReadOnly)
View
2 enable/example_canvas.py
@@ -11,7 +11,7 @@
""" A suitable replacement for the old Canvas class in Kiva.
"""
-from enthought.enable.api import Component, Window
+from enable.api import Component, Window
class _DummyComponent(Component):
def __init__(self, draw_func, *args, **kwargs):
View
2 enable/example_support.py
@@ -9,7 +9,7 @@
# 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 enthought.enable.toolkit
+#import enable.toolkit
if not ETSConfig.toolkit:
for toolkit, toolkit_module in (('wx', 'wx'), ('qt4', 'PyQt4')):
try:
View
2 enable/gl_graphics_context.py
@@ -1,5 +1,5 @@
-from enthought.kiva.gl import GraphicsContext
+from enable.kiva.gl import GraphicsContext
from graphics_context import GraphicsContextEnable
class GLGraphicsContextEnable(GraphicsContextEnable, GraphicsContext):
View
4 enable/graphics_context.py
@@ -1,5 +1,5 @@
-from enthought.kiva.constants import FILL
+from enable.kiva.constants import FILL
# Relative imports
from abstract_window import AbstractWindow
@@ -88,7 +88,7 @@ class GraphicsContextEnable(EnableGCMixin, GraphicsContext):
# Define an ImageGraphicsContextEnable that is guaranteed to be a subclass of
# an ImageGraphicsContext, regardless of the actual Kiva backend. If the kiva
# backend is already the GraphicsContextImage, then just create an alias.
-from enthought.kiva.image import GraphicsContext as GraphicsContextImage
+from enable.kiva.image import GraphicsContext as GraphicsContextImage
if isinstance(GraphicsContext, GraphicsContextImage):
ImageGraphicsContextEnable = GraphicsContextEnable
else:
View
4 enable/interactor.py
@@ -1,12 +1,12 @@
""" Defines the Interactor class """
# Enthought library imports
-from enthought.kiva.affine import affine_identity
+from enable.kiva.affine import affine_identity
from traits.api import Any, Bool, HasTraits, List, Property, Str, Trait
# Local relative imports
from enable_traits import cursor_style_trait, Pointer
-from enthought.enable.colors import ColorTrait
+from enable.colors import ColorTrait
class Interactor(HasTraits):
"""
View
4 enable/kiva/agg/src/graphics_context.i
@@ -212,7 +212,7 @@ namespace kiva {
import numpy
# Define paths for the two markers that Agg renders incorrectly
- from enthought.kiva.constants import DIAMOND_MARKER, CIRCLE_MARKER, FILL_STROKE
+ from enable.kiva.constants import DIAMOND_MARKER, CIRCLE_MARKER, FILL_STROKE
def circle_marker_path(path, size):
circle_points = array([[ 1. , 0. ],
@@ -256,7 +256,7 @@ namespace kiva {
#from enthought import freetype
#ft_engine = freetype.FreeType(dpi=120.0)
- from enthought.kiva import fonttools
+ from enable.kiva import fonttools
def handle_unicode(text):
"Returns a latin1 encoded 8-bit string from 'text'"
View
2 enable/kiva/agg/src/hit_test.i
@@ -54,7 +54,7 @@ def points_in_polygon(pts, poly_pts, use_winding=False):
Example::
>>> from numpy import *
- >>> from enthought.kiva import agg
+ >>> from enable.kiva import agg
>>> poly = array(((0.0, 0.0),
(10.0, 0.0),
(10.0, 10.0),
View
2 enable/kiva/agg/tests/affine_matrix_test_case.py
@@ -3,7 +3,7 @@
from numpy import array, allclose, ones, alltrue
-from enthought.kiva import agg
+from enable.kiva import agg
class AffineMatrixTestCase(unittest.TestCase):
View
2 enable/kiva/agg/tests/clip_to_rect_test_case.py
@@ -22,7 +22,7 @@
import nose
-from enthought.kiva.agg import GraphicsContextArray
+from enable.kiva.agg import GraphicsContextArray
from enthought import kiva
from test_utils import Utils
View
2 enable/kiva/agg/tests/compiled_path_test_case.py
@@ -2,7 +2,7 @@
from numpy import array, alltrue, ravel, pi
-from enthought.kiva import agg
+from enable.kiva import agg
from test_utils import Utils
View
4 enable/kiva/agg/tests/font_loading_test.py
@@ -2,8 +2,8 @@
import os
import time
-from enthought.kiva.image import font_metrics_provider as FMP
-from enthought.kiva.fonttools import Font
+from enable.kiva.image import font_metrics_provider as FMP
+from enable.kiva.fonttools import Font
counts = (500,)
strings = ("hello", ) # lowercase + uppercase)
View
2 enable/kiva/agg/tests/gcmemtest.py
@@ -5,7 +5,7 @@
import unittest, sys
import gc as garbagecollector
-from enthought.kiva.image import GraphicsContext, GraphicsContextSystem
+from enable.kiva.image import GraphicsContext, GraphicsContextSystem
from enthought.debug.memusage import get_mem_usage
class test_agg(unittest.TestCase):
View
4 enable/kiva/agg/tests/graphics_context_test_case.py
@@ -4,8 +4,8 @@
from numpy import all, allclose, array, dtype, pi, ones
-from enthought.kiva import agg
-from enthought.kiva.fonttools import Font
+from enable.kiva import agg
+from enable.kiva.fonttools import Font
class GraphicsContextArrayTestCase(unittest.TestCase):
View
2 enable/kiva/agg/tests/join_stroke_path_test_case.py
@@ -24,7 +24,7 @@
from numpy import array, alltrue, ravel
-from enthought.kiva.agg import GraphicsContextArray
+from enable.kiva.agg import GraphicsContextArray
from enthought import kiva
from test_utils import Utils
View
2 enable/kiva/agg/tests/points_in_polygon_test_case.py
@@ -2,7 +2,7 @@
from numpy import array, allclose
-from enthought.kiva import agg
+from enable.kiva import agg
class TestPointsInPolygon(unittest.TestCase):
View
2 enable/kiva/agg/tests/rgba_test_case.py
@@ -2,7 +2,7 @@
from numpy import array, ones
-from enthought.kiva import agg
+from enable.kiva import agg
from test_utils import Utils
View
2 enable/kiva/agg/tests/stroke_path_test_case.py
@@ -51,7 +51,7 @@
from numpy import array, alltrue, ravel
-from enthought.kiva.agg import GraphicsContextArray
+from enable.kiva.agg import GraphicsContextArray
from enthought import kiva
from test_utils import Utils
View
2 enable/kiva/agg/tests/test_graphics_context_system.py
@@ -1,6 +1,6 @@
import unittest
-from enthought.kiva.agg import GraphicsContextSystem
+from enable.kiva.agg import GraphicsContextSystem
class GraphicsContextSystemTestCase(unittest.TestCase):
View
2 enable/kiva/agg/tests/test_save.py
@@ -5,7 +5,7 @@
import nose
-from enthought.kiva import agg
+from enable.kiva import agg
# FIXME:
View
4 enable/kiva/agg/tests/unicode_font_test_case.py
@@ -1,6 +1,6 @@
import unittest
-from enthought.kiva.agg import AggFontType, GraphicsContextArray
-from enthought.kiva.fonttools import Font
+from enable.kiva.agg import AggFontType, GraphicsContextArray
+from enable.kiva.fonttools import Font
class UnicodeTest(unittest.TestCase):
View
2 enable/kiva/basecore2d.py
@@ -874,7 +874,7 @@ def add_path(self, path):
changed and not restored to the identity in the compiled path,
the CTM change will continue in this GC."""
# Local import to avoid a dependency if we can avoid it.
- from enthought.kiva import agg
+ from enable.kiva import agg
multi_state = 0 #For multi-element path commands we keep the previous
x_ctrl1 = 0 #information in these variables.
View
2 enable/kiva/cairo.py
@@ -864,7 +864,7 @@ def draw_image(self,img,rect=None):
Only works with numpy arrays. What is a "Kiva Image" anyway?
Not Yet Tested.
"""
- from enthought.kiva import agg
+ from enable.kiva import agg
if type(img) == type(numpy.array([])):
# Numeric array
View
2 enable/kiva/fonttools/font.py
@@ -4,7 +4,7 @@
"""
import copy
-from enthought.kiva.constants import DEFAULT, DECORATIVE, ROMAN, SCRIPT, \
+from enable.kiva.constants import DEFAULT, DECORATIVE, ROMAN, SCRIPT, \
SWISS, MODERN, TELETYPE, NORMAL, ITALIC, BOLD, BOLD_ITALIC
from font_manager import FontProperties, fontManager
View
12 enable/kiva/fonttools/fontTools/ttLib/__init__.py
@@ -8,7 +8,7 @@
Python 1.5.2c1 (#43, Mar 9 1999, 13:06:43) [CW PPC w/GUSI w/MSL]
Copyright 1991-1995 Stichting Mathematisch Centrum, Amsterdam
->>> from enthought.kiva.fonttools.fontTools import ttLib
+>>> from enable.kiva.fonttools.fontTools import ttLib
>>> tt = ttLib.TTFont("afont.ttf")
>>> tt['maxp'].numGlyphs
242
@@ -140,7 +140,7 @@ def save(self, file, makeSuitcase=0):
On the Mac, if makeSuitcase is true, a suitcase (resource fork)
file will we made instead of a flat .ttf file.
"""
- from enthought.kiva.fonttools.fontTools.ttLib import sfnt
+ from enable.kiva.fonttools.fontTools.ttLib import sfnt
if isinstance(file, basestring):
closeStream = 1
if os.name == "mac" and makeSuitcase:
@@ -176,7 +176,7 @@ def saveXML(self, fileOrPath, progress=None,
list of tables to dump. The 'skipTables' argument may be a list of tables
to skip, but only when the 'tables' argument is false.
"""
- from enthought.kiva.fonttools.fontTools import version
+ from enable.kiva.fonttools.fontTools import version
import xmlWriter
self.disassembleInstructions = disassembleInstructions
@@ -419,7 +419,7 @@ def _getGlyphNamesFromCmap(self):
tempcmap = self['cmap'].getcmap(3, 1)
if tempcmap is not None:
# we have a unicode cmap
- from enthought.kiva.fonttools.fontTools import agl
+ from enable.kiva.fonttools.fontTools import agl
cmap = tempcmap.cmap
# create a reverse cmap dict
reversecmap = {}
@@ -465,7 +465,7 @@ def getGlyphNames2(self):
"""Get a list of glyph names, sorted alphabetically,
but not case sensitive.
"""
- from enthought.kiva.fonttools.fontTools.misc import textTools
+ from enable.kiva.fonttools.fontTools.misc import textTools
return textTools.caselessSort(self.getGlyphOrder())
def getGlyphName(self, glyphID):
@@ -585,7 +585,7 @@ def getTableModule(tag):
import tables
pyTag = tagToIdentifier(tag)
try:
- module = __import__("enthought.kiva.fonttools.fontTools.ttLib.tables." + pyTag)
+ module = __import__("enable.kiva.fonttools.fontTools.ttLib.tables." + pyTag)
except ImportError:
return None
else:
View
6 enable/kiva/fonttools/fontTools/ttLib/macUtils.py
@@ -32,7 +32,7 @@ def openTTFonts(path):
but in the case of a Mac font suitcase it will contain as many
font objects as there are sfnt resources in the file.
"""
- from enthought.kiva.fonttools.fontTools import ttLib
+ from enable.kiva.fonttools.fontTools import ttLib
fonts = []
sfnts = getSFNTResIndices(path)
if not sfnts:
@@ -78,7 +78,7 @@ def __init__(self, path, ttFont, res_id=None):
familyname = ttFont['name'].getName(1, 1, 0) # Fam. name, mac, default encoding
psname = ttFont['name'].getName(6, 1, 0) # PostScript name, etc.
if fullname is None or fullname is None or psname is None:
- from enthought.kiva.fonttools.fontTools import ttLib
+ from enable.kiva.fonttools.fontTools import ttLib
raise ttLib.TTLibError, "can't make 'sfnt' resource, no Macintosh 'name' table found"
self.fullname = fullname.string
self.familyname = familyname.string
@@ -125,7 +125,7 @@ def createFond(self):
fond_res = Res.Resource("")
fond_res.AddResource('FOND', self.res_id, self.fullname)
- from enthought.kiva.fonttools.fontTools import fondLib
+ from enable.kiva.fonttools.fontTools import fondLib
fond = fondLib.FontFamily(fond_res, "w")
fond.ffFirstChar = 0
View
12 enable/kiva/fonttools/fontTools/ttLib/sfnt.py
@@ -13,7 +13,7 @@
"""
import struct
-from enthought.kiva.fonttools import sstruct
+from enable.kiva.fonttools import sstruct
import numpy
import os
@@ -29,11 +29,11 @@ def __init__(self, file, checkChecksums=1):
self.checkChecksums = checkChecksums
data = self.file.read(sfntDirectorySize)
if len(data) <> sfntDirectorySize:
- from enthought.kiva.fonttools.fontTools import ttLib
+ from enable.kiva.fonttools.fontTools import ttLib
raise ttLib.TTLibError, "Not a TrueType or OpenType font (not enough data)"
sstruct.unpack(sfntDirectoryFormat, data, self)
if self.sfntVersion not in ("\000\001\000\000", "OTTO", "true"):
- from enthought.kiva.fonttools.fontTools import ttLib
+ from enable.kiva.fonttools.fontTools import ttLib
raise ttLib.TTLibError, "Not a TrueType or OpenType font (bad sfntVersion)"
self.tables = {}
for i in range(self.numTables):
@@ -101,7 +101,7 @@ def __setitem__(self, tag, data):
# of the data is still the same, we allow overwriting it.
entry = self.tables[tag]
if len(data) <> entry.length:
- from enthought.kiva.fonttools.fontTools import ttLib
+ from enable.kiva.fonttools.fontTools import ttLib
raise ttLib.TTLibError, "cannot rewrite '%s' table: length does not match directory entry" % tag
else:
entry = SFNTDirectoryEntry()
@@ -128,7 +128,7 @@ def close(self, closeStream=1):
tables = self.tables.items()
tables.sort()
if len(tables) <> self.numTables:
- from enthought.kiva.fonttools.fontTools import ttLib
+ from enable.kiva.fonttools.fontTools import ttLib
raise ttLib.TTLibError, "wrong number of tables; expected %d, found %d" % (self.numTables, len(tables))
directory = sstruct.pack(sfntDirectoryFormat, self)
@@ -212,7 +212,7 @@ def calcChecksum(data, start=0):
If the data length is not a multiple of four, it assumes
it is to be padded with null byte.
"""
- from enthought.kiva.fonttools.fontTools import ttLib
+ from enable.kiva.fonttools.fontTools import ttLib
remainder = len(data) % 4
if remainder:
data = data + '\0' * (4-remainder)
View
4 enable/kiva/fonttools/fontTools/ttLib/tables/DefaultTable.py
@@ -27,8 +27,8 @@ def toXML(self, writer, ttFont):
writer.newline()
def fromXML(self, (name, attrs, content), ttFont):
- from enthought.kiva.fonttools.fontTools.misc.textTools import readHex
- from enthought.kiva.fonttools.fontTools import ttLib
+ from enable.kiva.fonttools.fontTools.misc.textTools import readHex
+ from enable.kiva.fonttools.fontTools import ttLib
if name <> "hexdata":
raise ttLib.TTLibError, "can't handle '%s' element" % name
self.decompile(readHex(content), ttFont)
View
4 enable/kiva/fonttools/fontTools/ttLib/tables/_n_a_m_e.py
@@ -1,7 +1,7 @@
import DefaultTable
import struct
-from enthought.kiva.fonttools import sstruct
-from enthought.kiva.fonttools.fontTools.misc.textTools import safeEval
+from enable.kiva.fonttools import sstruct
+from enable.kiva.fonttools.fontTools.misc.textTools import safeEval
import string
import types
View
2 enable/kiva/fonttools/font_manager.py
@@ -56,7 +56,7 @@
import afm
from traits.etsconfig.api import ETSConfig
-from enthought.kiva.fonttools.fontTools.ttLib import TTFont
+from enable.kiva.fonttools.fontTools.ttLib import TTFont
try:
import cPickle as pickle
View
2 enable/kiva/pdf.py
@@ -598,7 +598,7 @@ def draw_image(self, img, rect=None):
# it brute-force using Agg.
from reportlab.lib.utils import ImageReader
from PIL import Image as PilImage
- from enthought.kiva import agg
+ from enable.kiva import agg
if type(img) == type(array([])):
# Numeric array
View
2 enable/kiva/qpainter.py
@@ -545,7 +545,7 @@ def draw_image(self, img, rect=None):
rect - a tuple (x,y,w,h)
"""
- from enthought.kiva import agg
+ from enable.kiva import agg
def copy_padded(array):
""" Pad image width to a multiple of 4 pixels, and minimum dims of
View
4 enable/kiva/quartz/ABCGI.pyx
@@ -134,7 +134,7 @@ class URLPathStyle:
c_numpy.import_array()
import numpy
-from enthought.kiva import constants
+from enable.kiva import constants
cap_style = {}
cap_style[constants.CAP_ROUND] = kCGLineCapRound
@@ -2476,7 +2476,7 @@ cdef class _Markers:
Parameters
----------
marker_type : int
- One of the enumerated marker types in enthought.kiva.constants.
+ One of the enumerated marker types in enable.kiva.constants.
size : float, optional
The linear size in points of the marker. Some markers (e.g. dot)
ignore this.
View
6 enable/kiva/readme.txt
@@ -4,7 +4,7 @@ To import kiva, you need to get the constants (which includes pen styles,
cap styles, lines styles, etc.), the font stuff, and a backend. You can
import these all together with a wildcard:
- from enthought.kiva import *
+ from enable.kiva import *
If you prefer to get the constants by themselves, you can also do a:
@@ -16,7 +16,7 @@ etc.
If you don't wish to do a wildcard import, you can also just grab the
following by themselves:
- from enthought.kiva import Font, CompiledPath, GraphicsContext,
+ from enable.kiva import Font, CompiledPath, GraphicsContext,
Canvas, CanvasWindow
This will auto-detect what backend is appropriate based on the OS platform,
@@ -26,7 +26,7 @@ default ordering of backends is in __init__.py.
If you want to choose what backend gets used, you can do the following:
- from enthought.kiva.backend_<backend> import GraphicsContext, Canvas, CanvasWindow
+ from enable.kiva.backend_<backend> import GraphicsContext, Canvas, CanvasWindow
<backend> is one of:
image - in-memory GraphicsContext, uses Agg to raster, can save out to any PIL format
View
2 enable/kiva/tests/affine_test_case.py
@@ -14,7 +14,7 @@
import sys
from numpy import arctan2, alltrue, array, identity, dot, ravel, allclose, pi,cos
-from enthought.kiva import affine
+from enable.kiva import affine
class AffineConstructorsTestCase(unittest.TestCase):
View
6 enable/kiva/tests/basecore2d_test_case.py
@@ -15,9 +15,9 @@
from numpy import alltrue, array, ravel
-from enthought.kiva import affine
-from enthought.kiva import basecore2d
-from enthought.kiva import constants
+from enable.kiva import affine
+from enable.kiva import basecore2d
+from enable.kiva import constants
class test_is_fully_transparent(unittest.TestCase):
def test_simple(self):
View
2 enable/kiva/tests/macport_test.py
@@ -5,7 +5,7 @@
if sys.platform == 'darwin':
import wx
- from enthought.kiva.quartz import get_macport
+ from enable.kiva.quartz import get_macport
class SimpleWindow(wx.Frame):
"""
View
6 enable/kiva/trait_defs/kiva_font_trait.py
@@ -49,7 +49,7 @@ def init_constants ( ):
if font_families is not None:
return
- import enthought.kiva.constants as kc
+ import enable.kiva.constants as kc
DEFAULT = kc.DEFAULT
NORMAL = kc.NORMAL
@@ -101,7 +101,7 @@ class TraitKivaFont ( TraitHandler ):
def validate ( self, object, name, value ):
""" Validates that the value is a valid font.
"""
- from enthought.kiva.fonttools import Font
+ from enable.kiva.fonttools import Font
if isinstance( value, Font ):
return value
@@ -165,7 +165,7 @@ def KivaFontFunc ( *args, **metadata ):
-----------
For wxPython, the returned trait accepts any of the following:
- * an enthought.kiva.fonttools.Font instance
+ * an enable.kiva.fonttools.Font instance
* a string describing the font, including one or more of the font family,
size, weight, style, and typeface name.
View
10 enable/kiva/trait_defs/ui/wx/kiva_font_editor.py
@@ -27,7 +27,7 @@
from traitsui.wx.font_editor \
import ToolkitEditorFactory as EditorFactory
-from enthought.kiva.fonttools.font_manager import fontManager
+from enable.kiva.fonttools.font_manager import fontManager
#-------------------------------------------------------------------------------
@@ -58,7 +58,7 @@ def to_wx_font ( self, editor ):
""" Returns a wxFont object corresponding to a specified object's font
trait.
"""
- import enthought.kiva.constants as kc
+ import enable.kiva.constants as kc
font = editor.value
weight = ( wx.NORMAL, wx.BOLD )[ font.weight == kc.BOLD ]
@@ -80,8 +80,8 @@ def to_wx_font ( self, editor ):
def from_wx_font ( self, font ):
""" Gets the application equivalent of a wxPython value.
"""
- import enthought.kiva.constants as kc
- from enthought.kiva.fonttools import Font
+ import enable.kiva.constants as kc
+ from enable.kiva.fonttools import Font
return Font( size = font.GetPointSize(),
family = { wx.DEFAULT: kc.DEFAULT,
@@ -103,7 +103,7 @@ def from_wx_font ( self, font ):
def str_font ( self, font ):
""" Returns the text representation of the specified object trait value.
"""
- import enthought.kiva.constants as kc
+ import enable.kiva.constants as kc
weight = { kc.BOLD: ' Bold' }.get( font.weight, '' )
style = { kc.ITALIC: ' Italic' }.get( font.style, '' )
View
4 enable/label.py
@@ -5,8 +5,8 @@
from numpy import asarray
# Enthought library imports
-from enthought.kiva.constants import FILL, STROKE
-from enthought.kiva.trait_defs.kiva_font_trait import KivaFont
+from enable.kiva.constants import FILL, STROKE
+from enable.kiva.trait_defs.kiva_font_trait import KivaFont
from traits.api import Bool, Enum, Float, HasTraits, Int, \
List, Str
View
4 enable/markers.py
@@ -8,7 +8,7 @@
# Enthought library imports
from traits.api import HasTraits, Bool, Instance, Trait
from traitsui.api import EnumEditor
-from enthought.kiva.constants import STROKE, FILL_STROKE, \
+from enable.kiva.constants import STROKE, FILL_STROKE, \
SQUARE_MARKER, DIAMOND_MARKER, CIRCLE_MARKER, \
CROSS_MARKER, TRIANGLE_MARKER, \
INVERTED_TRIANGLE_MARKER, PLUS_MARKER, DOT_MARKER, \
@@ -27,7 +27,7 @@ class AbstractMarker(HasTraits):
draw_mode = STROKE
#draw_mode = Enum(FILL, EOF_FILL, STROKE, FILL_STROKE, EOF_FILL_STROKE)
- # The kiva marker type (from enthought.kiva.constants).
+ # The kiva marker type (from enable.kiva.constants).
kiva_marker = NO_MARKER
# Close the path object after drawing this marker?
View
2 enable/new_abstract_component.py
@@ -41,7 +41,7 @@ class AbstractComponent(Interactor):
window = Property # Instance("Window")
# The list of viewport that are viewing this component
- viewports = List(Instance("enthought.enable.Viewport"))
+ viewports = List(Instance("enable.Viewport"))
#------------------------------------------------------------------------
# Other public traits
View
2 enable/null/cairo.py
@@ -9,7 +9,7 @@
# Thanks for using Enthought open source!
#------------------------------------------------------------------------------
-from enthought.kiva.cairo import CompiledPath, GraphicsContext, font_metrics_provider
+from enable.kiva.cairo import CompiledPath, GraphicsContext, font_metrics_provider
class NativeScrollBar(object):
pass
View
2 enable/null/image.py
@@ -9,7 +9,7 @@
# Thanks for using Enthought open source!
#------------------------------------------------------------------------------
-from enthought.kiva.agg import CompiledPath, GraphicsContextArray as GraphicsContext
+from enable.kiva.agg import CompiledPath, GraphicsContextArray as GraphicsContext
class NativeScrollBar(object):
pass
View
4 enable/null/pdf.py
@@ -9,7 +9,7 @@
# Thanks for using Enthought open source!
#------------------------------------------------------------------------------
-from enthought.kiva.pdf import CompiledPath, GraphicsContext
+from enable.kiva.pdf import CompiledPath, GraphicsContext
class NativeScrollBar(object):
pass
@@ -20,7 +20,7 @@ class Window(object):
def font_metrics_provider():
from reportlab.pdfgen.canvas import Canvas
from reportlab.lib.pagesizes import letter
- from enthought.kiva.fonttools import Font
+ from enable.kiva.fonttools import Font
# a file will not be created unless save() is called on the context
pdf_canvas = Canvas(filename='enable_tmp.pdf', pagesize=letter)
View
4 enable/null/ps.py
@@ -9,7 +9,7 @@
# Thanks for using Enthought open source!
#------------------------------------------------------------------------------
-from enthought.kiva.ps import CompiledPath, PSGC as GraphicsContext
+from enable.kiva.ps import CompiledPath, PSGC as GraphicsContext
class NativeScrollBar(object):
pass
@@ -18,7 +18,7 @@ class Window(object):
pass
def font_metrics_provider():
- from enthought.kiva.fonttools import Font
+ from enable.kiva.fonttools import Font
gc = GraphicsContext((1, 1))
gc.set_font(Font())
return gc
View
2 enable/null/qpainter.py
@@ -9,7 +9,7 @@
# Thanks for using Enthought open source!
#------------------------------------------------------------------------------
-from enthought.kiva.qpainter import CompiledPath, GraphicsContext, font_metrics_provider
+from enable.kiva.qpainter import CompiledPath, GraphicsContext, font_metrics_provider
class NativeScrollBar(object):
pass
View
4 enable/null/quartz.py
@@ -11,8 +11,8 @@
import numpy as np
-from enthought.kiva.fonttools import Font
-from enthought.kiva.quartz import ABCGI
+from enable.kiva.fonttools import Font
+from enable.kiva.quartz import ABCGI
class NativeScrollBar(object):
pass
View
2 enable/null/svg.py
@@ -9,7 +9,7 @@
# Thanks for using Enthought open source!
#------------------------------------------------------------------------------
-from enthought.kiva.svg import CompiledPath, GraphicsContext, font_metrics_provider
+from enable.kiva.svg import CompiledPath, GraphicsContext, font_metrics_provider
class NativeScrollBar(object):
pass
View
4 enable/primitives/annotater.py
@@ -6,8 +6,8 @@
from traits.api import Event, Trait, TraitPrefixList
from traitsui.api import Group, View
-from enthought.enable.api import Component
-from enthought.enable.colors import ColorTrait
+from enable.api import Component
+from enable.colors import ColorTrait
class Annotater(Component):
View
6 enable/primitives/box.py
@@ -2,9 +2,9 @@
"""
# Parent package imports
-from enthought.enable.api import border_size_trait, Component, transparent_color
-from enthought.enable.colors import ColorTrait
-from enthought.kiva.constants import FILL, STROKE
+from enable.api import border_size_trait, Component, transparent_color
+from enable.colors import ColorTrait
+from enable.kiva.constants import FILL, STROKE
class Box(Component):
View
6 enable/primitives/line.py
@@ -3,12 +3,12 @@
from numpy import array, resize
# Enthought library imports.
-from enthought.kiva.constants import FILL, FILL_STROKE, STROKE
+from enable.kiva.constants import FILL, FILL_STROKE, STROKE
from traits.api import Any, Event, Float, List, Trait, Bool
# Local imports.
-from enthought.enable.api import border_size_trait, Component
-from enthought.enable.colors import ColorTrait
+from enable.api import border_size_trait, Component
+from enable.colors import ColorTrait
class Line(Component):
View
8 enable/primitives/polygon.py
@@ -5,15 +5,15 @@
from numpy import array
# Enthought library imports.
-from enthought.kiva.constants import EOF_FILL_STROKE, FILL, FILL_STROKE
-from enthought.kiva.agg import points_in_polygon
+from enable.kiva.constants import EOF_FILL_STROKE, FILL, FILL_STROKE
+from enable.kiva.agg import points_in_polygon
from traits.api import Any, Event, Float, HasTraits, Instance, List, \
Property, Trait, Tuple
from traitsui.api import Group, View
# Local imports.
-from enthought.enable.api import border_size_trait, Component
-from enthought.enable.colors import ColorTrait
+from enable.api import border_size_trait, Component
+from enable.colors import ColorTrait
class PolygonModel(HasTraits):
View
6 enable/primitives/shape.py
@@ -5,9 +5,9 @@
import math
# Enthought library imports.
-from enthought.enable.api import ColorTrait, Component, Pointer
-from enthought.kiva.constants import MODERN
-from enthought.kiva.fonttools import Font
+from enable.api import ColorTrait, Component, Pointer
+from enable.kiva.constants import MODERN
+from enable.kiva.fonttools import Font
from traits.api import Float, Property, Str, Tuple
View
6 enable/pyglet_backend/window.py
@@ -14,9 +14,9 @@
from traits.api import Any, Bool
# Enable imports
-from enthought.enable.events import MouseEvent, KeyEvent
-from enthought.enable.graphics_context import GraphicsContextEnable
-from enthought.enable.abstract_window import AbstractWindow
+from enable.events import MouseEvent, KeyEvent
+from enable.graphics_context import GraphicsContextEnable
+from enable.abstract_window import AbstractWindow
# local, relative imports
from constants import ASCII_CONTROL_KEYS, KEY_MAP, \
View
4 enable/qt4/base_window.py
@@ -18,8 +18,8 @@
from traits.qt import QtCore, QtGui, QtOpenGL
# Enthought library imports.
-from enthought.enable.abstract_window import AbstractWindow
-from enthought.enable.events import KeyEvent, MouseEvent
+from enable.abstract_window import AbstractWindow
+from enable.events import KeyEvent, MouseEvent
from traits.api import Instance
# Local imports.
View
2 enable/qt4/cairo.py
@@ -10,7 +10,7 @@
#------------------------------------------------------------------------------
from traits.qt import QtCore, QtGui
-from enthought.kiva.cairo import CompiledPath, GraphicsContext, font_metrics_provider
+from enable.kiva.cairo import CompiledPath, GraphicsContext, font_metrics_provider
from base_window import BaseWindow
from scrollbar import NativeScrollBar
View
4 enable/qt4/gl.py
@@ -13,7 +13,7 @@
pyglet.options['shadow_window'] = False
from traits.api import Bool, Instance
-from enthought.kiva.gl import CompiledPath, GraphicsContext
+from enable.kiva.gl import CompiledPath, GraphicsContext
from base_window import BaseGLWindow
from scrollbar import NativeScrollBar
@@ -55,7 +55,7 @@ def _paint(self, event=None):
self._update_region = []
def font_metrics_provider():
- from enthought.kiva.fonttools import Font
+ from enable.kiva.fonttools import Font
gc = GraphicsContext((1, 1))
gc.set_font(Font())
return gc
View
4 enable/qt4/image.py
@@ -10,7 +10,7 @@
#------------------------------------------------------------------------------
from traits.qt import QtCore, QtGui
-from enthought.kiva.agg import CompiledPath, GraphicsContextSystem as GraphicsContext
+from enable.kiva.agg import CompiledPath, GraphicsContextSystem as GraphicsContext
from base_window import BaseWindow
from scrollbar import NativeScrollBar
@@ -42,7 +42,7 @@ def _window_paint(self, event):
painter.drawImage(rect, image)
def font_metrics_provider():
- from enthought.kiva.fonttools import Font
+ from enable.kiva.fonttools import Font
gc = GraphicsContext((1, 1))
gc.set_font(Font())
return gc
View
2 enable/qt4/qpainter.py
@@ -9,7 +9,7 @@
# Thanks for using Enthought open source!
#------------------------------------------------------------------------------
-from enthought.kiva.qpainter import CompiledPath, GraphicsContext, font_metrics_provider
+from enable.kiva.qpainter import CompiledPath, GraphicsContext, font_metrics_provider
from base_window import BaseWindow
from scrollbar import NativeScrollBar
View
2 enable/qt4/scrollbar.py
@@ -10,7 +10,7 @@
from traits.api import Any, Bool, Float, Int, Property, Trait, \
TraitError
-from enthought.enable.component import Component
+from enable.component import Component
def valid_range(object, name, value):
View
12 enable/savage/compliance/comparator.py
@@ -16,16 +16,16 @@
import Image
import numpy as np
-from enthought.enable.api import Component
-from enthought.enable.component_editor import ComponentEditor
+from enable.api import Component
+from enable.component_editor import ComponentEditor
from traits.api import (Any, Button, Dict, HasTraits, HTML, Instance,
List, Property, Str, on_trait_change)
from traitsui import api as tui
-from enthought.savage.svg import document
-from enthought.savage.trait_defs.ui.svg_editor import SVGEditor
-from enthought.savage.svg.backends.wx.renderer import Renderer as WxRenderer
-from enthought.savage.svg.backends.kiva.renderer import Renderer as KivaRenderer
+from enable.savage.svg import document
+from enable.savage.trait_defs.ui.svg_editor import SVGEditor
+from enable.savage.svg.backends.wx.renderer import Renderer as WxRenderer
+from enable.savage.svg.backends.kiva.renderer import Renderer as KivaRenderer
from crosshair import Crosshair, MultiController
from profile_this import ProfileThis
View
2 enable/savage/compliance/crosshair.py
@@ -1,7 +1,7 @@
""" Cross-hair tool for measuring SVG rendering results.
"""
-from enthought.enable.api import BaseTool, ColorTrait, LineStyle
+from enable.api import BaseTool, ColorTrait, LineStyle
from traits.api import Bool, Float, HasTraits, List, Tuple, on_trait_change
View
4 enable/savage/compliance/svg_component.py
@@ -4,9 +4,9 @@
import sys
import time
-from enthought.enable.api import Component
+from enable.api import Component
from traits.api import Any, Array, Bool, Float
-from enthought.kiva.fonttools import Font
+from enable.kiva.fonttools import Font
if sys.platform == 'win32':
View
4 enable/savage/compliance/viewer.py
@@ -5,9 +5,9 @@
import wx
import wx.aui
-import enthought.savage.svg.document as document
+import enable.savage.svg.document as document
-from enthought.savage.trait_defs.ui.wx.wx_render_panel import RenderPanel
+from enable.savage.trait_defs.ui.wx.wx_render_panel import RenderPanel
class ReferencePanel(wx.Panel):
def __init__(self, parent, bmp):
View
10 enable/savage/svg/backends/kiva/renderer.py
@@ -4,12 +4,12 @@
import numpy as np
-from enthought.enable.compiled_path import CompiledPath as KivaCompiledPath
-from enthought.kiva import affine, constants, fonttools
-from enthought.kiva.fonttools import Font
+from enable.compiled_path import CompiledPath as KivaCompiledPath
+from enable.kiva import affine, constants, fonttools
+from enable.kiva.fonttools import Font
-from enthought.savage.svg import svg_extras
-from enthought.savage.svg.backends.null.null_renderer import NullRenderer, AbstractGradientBrush
+from enable.savage.svg import svg_extras
+from enable.savage.svg.backends.null.null_renderer import NullRenderer, AbstractGradientBrush
# Get the Canvas class for drawing on...
View
2 enable/savage/svg/backends/wx/__init__.py
@@ -4,7 +4,7 @@
import math
import wx
-from enthought.savage.svg import svg_extras
+from enable.savage.svg import svg_extras
def elliptical_arc_to(self, rx, ry, phi, large_arc_flag, sweep_flag, x2, y2):
x1, y1 = self.GetCurrentPoint()
View
2 enable/savage/svg/backends/wx/renderer.py
@@ -3,7 +3,7 @@
import warnings
import wx
-from enthought.savage.svg.backends.null.null_renderer import NullRenderer
+from enable.savage.svg.backends.null.null_renderer import NullRenderer
def _fixup_path_methods(path):
View
2 enable/savage/svg/css/colour.py
@@ -11,7 +11,7 @@
import string
import urlparse
from pyparsing import nums, Literal, Optional, oneOf, Group, StringEnd, Combine, Word, alphas, hexnums
-from enthought.savage.svg.pathdata import number, sign
+from enable.savage.svg.pathdata import number, sign
number = number.copy()
integerConstant = Word(nums+"+-").setParseAction(lambda t:int(t[0]))