Permalink
Browse files

update the few imports to not use etsproxy

  • Loading branch information...
1 parent 64b01b6 commit e5a2dcd1373f49d64691561e6cd821398dd2c3df Ilan Schnell committed Jun 5, 2011
View
@@ -1,7 +1,7 @@
* Remove the import of pyface.resource for core functionality in
resource_manager.py and i_image_resource.py.
-* Remove the dependency on enthought.developer AND enthought.io by refactoring
+* Remove the dependency on etsdevtools.developer AND apptools.io by refactoring
dock features modules.
* Remove the dock dependence on TraitsBackendWX by removing the direct imports
@@ -28,7 +28,7 @@
from pyface.image_resource \
import ImageResource
-from enthought.developer.tools.ui_debugger import UIDebugger
+from etsdevtools.developer.tools.ui_debugger import UIDebugger
#-------------------------------------------------------------------------------
# Constants:
@@ -30,7 +30,7 @@
import wx
# Enthought library imports.
-from enthought.io.file import File as EnthoughtFile
+from apptools.io.file import File as EnthoughtFile
from pyface.i_python_shell import IPythonShell
from pyface.key_pressed_event import KeyPressedEvent
from traits.api import Event, implements, Instance, Str
@@ -61,7 +61,7 @@ class UserPerspectiveName(HasTraits):
)
),
title = 'New User Perspective',
- id = 'enthought.envisage.workbench.action.'
+ id = 'envisage.workbench.action.'
'new_user_perspective_action.UserPerspectiveName',
buttons = [ 'OK', 'Cancel' ],
kind = 'livemodal',
@@ -70,7 +70,7 @@ class UserPerspectiveName(HasTraits):
save_as_view = View( 'name',
title = 'Save User Perspective As',
- id = 'enthought.envisage.workbench.action.'
+ id = 'envisage.workbench.action.'
'save_as_user_perspective_action.UserPerspectiveName',
buttons = [ 'OK', 'Cancel' ],
kind = 'livemodal',
@@ -79,7 +79,7 @@ class UserPerspectiveName(HasTraits):
rename_view = View( 'name',
title = 'Rename User Perspective',
- id = 'enthought.envisage.workbench.action.'
+ id = 'envisage.workbench.action.'
'rename_user_perspective_action.UserPerspectiveName',
buttons = [ 'OK', 'Cancel' ],
kind = 'livemodal',
@@ -28,7 +28,7 @@ class IEditor(IWorkbenchPart):
""" The interface of a workbench editor. """
# The optional command stack.
- command_stack = Instance('enthought.undo.api.ICommandStack')
+ command_stack = Instance('apptools.undo.api.ICommandStack')
# Is the object that the editor is editing 'dirty' i.e., has it been
# modified but not saved?
@@ -67,7 +67,7 @@ class MEditor(MWorkbenchPart):
#### 'IEditor' interface ##################################################
# The optional command stack.
- command_stack = Instance('enthought.undo.api.ICommandStack')
+ command_stack = Instance('apptools.undo.api.ICommandStack')
# Is the object that the editor is editing 'dirty' i.e., has it been
# modified but not saved?
@@ -136,7 +136,7 @@ def _command_stack_default(self):
# We make sure the undo package is entirely optional.
try:
- from enthought.undo.api import CommandStack
+ from apptools.undo.api import CommandStack
except ImportError:
return None
@@ -20,14 +20,14 @@ class IWorkbench(Interface):
active_window = Instance(WorkbenchWindow)
# The optional application scripting manager.
- script_manager = Instance('enthought.appscripting.api.IScriptManager')
+ script_manager = Instance('apptools.appscripting.api.IScriptManager')
# A directory on the local file system that we can read and write to at
# will. This is used to persist window layout information, etc.
state_location = Str
# The optional undo manager.
- undo_manager = Instance('enthought.undo.api.IUndoManager')
+ undo_manager = Instance('apptools.undo.api.IUndoManager')
# The user defined perspectives manager.
user_perspective_manager = Instance(UserPerspectiveManager)
@@ -44,14 +44,14 @@ class Workbench(HasTraits):
editor_manager = Instance(IEditorManager)
# The optional application scripting manager.
- script_manager = Instance('enthought.appscripting.api.IScriptManager')
+ script_manager = Instance('apptools.appscripting.api.IScriptManager')
# A directory on the local file system that we can read and write to at
# will. This is used to persist window layout information, etc.
state_location = Unicode
# The optional undo manager.
- undo_manager = Instance('enthought.undo.api.IUndoManager')
+ undo_manager = Instance('apptools.undo.api.IUndoManager')
# The user-defined perspectives manager.
user_perspective_manager = Instance(UserPerspectiveManager)
@@ -259,7 +259,7 @@ def _undo_manager_default(self):
# We make sure the undo package is entirely optional.
try:
- from enthought.undo.api import UndoManager
+ from apptools.undo.api import UndoManager
except ImportError:
return None

0 comments on commit e5a2dcd

Please sign in to comment.