Permalink
Browse files

fixed imports

  • Loading branch information...
1 parent 8acc195 commit f6ffcd4cc1e7ccef226c3db6307a3586908b5b82 Ilan Schnell committed Apr 20, 2011
Showing 337 changed files with 791 additions and 791 deletions.
View
@@ -1,13 +1,13 @@
-* Remove the import of enthought.resource for core functionality in
+* 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
dock features modules.
* Remove the dock dependence on TraitsBackendWX by removing the direct imports
- of enthought.traits.ui.wx.
+ of traitsui.wx.
* Need to make use of drag and drop features optional in this project's code
(see dock, grid, sheet, tree, and viewer/tree_viewer) or help make
- enthought.util's drag_and_drop module backend agnostic. Right now, it has
+ traits.util's drag_and_drop module backend agnostic. Right now, it has
a runtime dependency that wx be installed.
View
@@ -25,7 +25,7 @@ Enhancements
* Changed default font to use the system font
- * Moved enthought.util.wx.clipboard to Pyface
+ * Moved traits.util.wx.clipboard to Pyface
* Moved the grid package out of pyface and into pyface.ui.wx, left deprecated warnings
@@ -15,9 +15,9 @@
# Enthought library imports.
-from enthought.pyface.api import ApplicationWindow, GUI
-from enthought.pyface.action.api import Action, MenuManager, MenuBarManager
-from enthought.pyface.action.api import StatusBarManager, ToolBarManager
+from pyface.api import ApplicationWindow, GUI
+from pyface.action.api import Action, MenuManager, MenuBarManager
+from pyface.action.api import StatusBarManager, ToolBarManager
class MainWindow(ApplicationWindow):
@@ -22,9 +22,9 @@
sys.path.append(os.path.abspath(r'..\..\..'))
# Enthought library imports.
-from enthought.pyface.api import GUI, OK
-from enthought.pyface.wizard.api import ChainedWizard, Wizard, WizardPage
-from enthought.traits.api import Color, HasTraits, Int, Str
+from pyface.api import GUI, OK
+from pyface.wizard.api import ChainedWizard, Wizard, WizardPage
+from traits.api import Color, HasTraits, Int, Str
class Details(HasTraits):
""" Some test data. """
View
@@ -21,9 +21,9 @@
sys.path.append(os.path.abspath(r'..\..\..'))
# Enthought library imports.
-from enthought.pyface.api import confirm, error, information, warning, YES
-from enthought.pyface.api import ApplicationWindow, GUI
-from enthought.pyface.action.api import Action, MenuBarManager, MenuManager
+from pyface.api import confirm, error, information, warning, YES
+from pyface.api import ApplicationWindow, GUI
+from pyface.action.api import Action, MenuBarManager, MenuManager
class MainWindow(ApplicationWindow):
View
@@ -17,19 +17,19 @@
import wx
import sys
-from enthought.traits.api \
+from traits.api \
import *
-from enthought.traits.ui.api \
+from traitsui.api \
import *
-from enthought.traits.ui.menu \
+from traitsui.menu \
import *
-from enthought.pyface.dock.api \
+from pyface.dock.api \
import *
-from enthought.pyface.image_resource \
+from pyface.image_resource \
import ImageResource
#-------------------------------------------------------------------------------
@@ -16,13 +16,13 @@
import sys
-from enthought.traits.api \
+from traits.api \
import *
-from enthought.traits.ui.api \
+from traitsui.api \
import *
-from enthought.traits.ui.menu \
+from traitsui.menu \
import *
#-------------------------------------------------------------------------------
@@ -16,16 +16,16 @@
import sys
-from enthought.traits.api \
+from traits.api \
import *
-from enthought.traits.ui.api \
+from traitsui.api \
import *
-from enthought.traits.ui.menu \
+from traitsui.menu \
import *
-from enthought.pyface.image_resource \
+from pyface.image_resource \
import ImageResource
from enthought.developer.tools.ui_debugger import UIDebugger
@@ -84,7 +84,7 @@ class TestDock ( HasPrivateTraits ):
id = 'dock_window'
),
title = 'DockWindow Test',
- id = 'enthought.pyface.dock.dock_test3',
+ id = 'pyface.dock.dock_test3',
dock = 'horizontal',
resizable = True,
width = 0.5,
View
@@ -16,22 +16,22 @@
import wx
-from enthought.traits.api \
+from traits.api \
import *
-from enthought.traits.ui.api \
+from traitsui.api \
import *
-from enthought.traits.ui.menu \
+from traitsui.menu \
import *
-from enthought.traits.ui.dockable_view_element \
+from traitsui.dockable_view_element \
import DockableViewElement
-from enthought.pyface.image_resource \
+from pyface.image_resource \
import ImageResource
-from enthought.pyface.dock.api \
+from pyface.dock.api \
import *
#-------------------------------------------------------------------------------
@@ -16,19 +16,19 @@
import wx
-from enthought.traits.api \
+from traits.api \
import *
-from enthought.traits.ui.api \
+from traitsui.api \
import *
-from enthought.traits.ui.menu \
+from traitsui.menu \
import *
-from enthought.pyface.image_resource \
+from pyface.image_resource \
import ImageResource
-from enthought.pyface.dock.api \
+from pyface.dock.api \
import *
#-------------------------------------------------------------------------------
View
@@ -24,9 +24,9 @@
sys.path.append(os.path.abspath(r'..\..\..'))
# Enthought library imports.
-from enthought.pyface.api import GUI, PythonShell, SplitApplicationWindow
-from enthought.pyface.expandable_panel import ExpandablePanel
-from enthought.traits.api import Float, Str
+from pyface.api import GUI, PythonShell, SplitApplicationWindow
+from pyface.expandable_panel import ExpandablePanel
+from traits.api import Float, Str
# Local imports.
from file_tree import FileTree
View
@@ -21,11 +21,11 @@
sys.path.append(os.path.abspath(r'..\..\..'))
# Enthought library imports.
-from enthought.pyface.api import ApplicationWindow, GUI, PythonShell, SplashScreen
-from enthought.pyface.api import SplitApplicationWindow, SplitPanel
-from enthought.pyface.action.api import Action, Group, MenuBarManager, MenuManager
-from enthought.pyface.action.api import Separator, StatusBarManager, ToolBarManager
-from enthought.traits.api import Float, Str
+from pyface.api import ApplicationWindow, GUI, PythonShell, SplashScreen
+from pyface.api import SplitApplicationWindow, SplitPanel
+from pyface.action.api import Action, Group, MenuBarManager, MenuManager
+from pyface.action.api import Separator, StatusBarManager, ToolBarManager
+from traits.api import Float, Str
# Local imports.
from file_filters import AllowOnlyFolders
View
@@ -18,7 +18,7 @@
from os.path import isdir
# Enthought library imports.
-from enthought.pyface.viewer.api import ViewerFilter
+from pyface.viewer.api import ViewerFilter
class AllowOnlyFolders(ViewerFilter):
@@ -19,7 +19,7 @@
from os.path import basename, isdir, isfile, join
# Enthought library imports.
-from enthought.pyface.tree.api import NodeManager, NodeType
+from pyface.tree.api import NodeManager, NodeType
class FileNode(NodeType):
View
@@ -18,7 +18,7 @@
from os.path import isdir
# Enthought library imports.
-from enthought.pyface.viewer.api import ViewerSorter
+from pyface.viewer.api import ViewerSorter
class FileSorter(ViewerSorter):
@@ -20,10 +20,10 @@
from time import localtime, strftime
# Enthought library imports.
-from enthought.pyface.api import ImageResource
-from enthought.pyface.viewer.api import TableColumnProvider, TableContentProvider
-from enthought.pyface.viewer.api import TableLabelProvider, TableViewer
-from enthought.traits.api import Instance, Str
+from pyface.api import ImageResource
+from pyface.viewer.api import TableColumnProvider, TableContentProvider
+from pyface.viewer.api import TableLabelProvider, TableViewer
+from traits.api import Instance, Str
View
@@ -19,9 +19,9 @@
from os.path import basename, isdir, join
# Enthought library imports.
-from enthought.pyface.api import ImageResource
-from enthought.pyface.tree.api import Tree, TreeModel
-from enthought.traits.api import Instance
+from pyface.api import ImageResource
+from pyface.tree.api import Tree, TreeModel
+from traits.api import Instance
class FileTreeModel(TreeModel):
@@ -19,10 +19,10 @@
from os.path import basename, dirname, isdir, join
# Enthought library imports.
-from enthought.pyface.api import ImageResource
-from enthought.pyface.viewer.api import TreeContentProvider, TreeLabelProvider
-from enthought.pyface.viewer.api import TreeViewer
-from enthought.traits.api import Instance
+from pyface.api import ImageResource
+from pyface.viewer.api import TreeContentProvider, TreeLabelProvider
+from pyface.viewer.api import TreeViewer
+from traits.api import Instance
class FileTreeContentProvider(TreeContentProvider):
View
@@ -24,10 +24,10 @@
sys.path.append(os.path.abspath(r'..\..\..'))
# Enthought library imports.
-from enthought.pyface.api import GUI, PythonShell, SplitApplicationWindow
-from enthought.pyface.ui.wx.grid.api import Grid, TraitGridModel, \
+from pyface.api import GUI, PythonShell, SplitApplicationWindow
+from pyface.ui.wx.grid.api import Grid, TraitGridModel, \
SimpleGridModel, GridRow, GridColumn, TraitGridColumn
-from enthought.traits.api import Float, Str
+from traits.api import Float, Str
class MainWindow(SplitApplicationWindow):
View
@@ -26,8 +26,8 @@
import wx.lib.wxpTag
# Enthought library imports.
-from enthought.pyface.api import ApplicationWindow, GUI, ImageResource, ImageWidget
-from enthought.pyface.action.api import Action, MenuManager, MenuBarManager
+from pyface.api import ApplicationWindow, GUI, ImageResource, ImageWidget
+from pyface.action.api import Action, MenuManager, MenuBarManager
# HTML templates.
@@ -14,8 +14,8 @@
""" IPython widget example. """
# Enthought library imports.
-from enthought.pyface.api import ApplicationWindow, GUI
-from enthought.pyface.ipython_widget import IPythonWidget
+from pyface.api import ApplicationWindow, GUI
+from pyface.ipython_widget import IPythonWidget
class MainWindow(ApplicationWindow):
@@ -21,8 +21,8 @@
sys.path.append(os.path.abspath(r'..\..\..'))
# Enthought library imports.
-from enthought.pyface.api import MDIApplicationWindow, MDIWindowMenu, GUI
-from enthought.pyface.action.api import Action, MenuManager, MenuBarManager
+from pyface.api import MDIApplicationWindow, MDIWindowMenu, GUI
+from pyface.action.api import Action, MenuManager, MenuBarManager
class MainWindow(MDIApplicationWindow):
View
@@ -18,8 +18,8 @@
sys.path.append(os.path.abspath(r'..\..\..'))
# Local imports.
-from enthought.pyface.action.api import Action
-from enthought.pyface.action.api import Group, MenuManager, Separator
+from pyface.action.api import Action
+from pyface.action.api import Group, MenuManager, Separator
file_menu = MenuManager(
@@ -29,9 +29,9 @@
pass
# Enthought library imports.
-from enthought.pyface.api import MultiToolbarWindow, GUI
-from enthought.pyface.action.api import Action, MenuManager, MenuBarManager
-from enthought.pyface.action.api import ToolBarManager
+from pyface.api import MultiToolbarWindow, GUI
+from pyface.action.api import Action, MenuManager, MenuBarManager
+from pyface.action.api import ToolBarManager
class MainWindow(MultiToolbarWindow):
View
@@ -21,12 +21,12 @@
sys.path.append(os.path.abspath(r'..\..\..'))
# Enthought library imports.
-from enthought.pyface.api import GUI, PythonShell, SplitApplicationWindow
-from enthought.traits.api import Float, Str
+from pyface.api import GUI, PythonShell, SplitApplicationWindow
+from traits.api import Float, Str
# Local imports.
from file_node_tree import node_manager
-from enthought.pyface.tree.api import NodeTree, NodeTreeModel
+from pyface.tree.api import NodeTree, NodeTreeModel
class MainWindow(SplitApplicationWindow):
@@ -2,8 +2,8 @@
# simple example of its use
#
import time
-from enthought.pyface.api import GUI, ApplicationWindow, ProgressDialog
-from enthought.pyface.action.api import Action, MenuManager, MenuBarManager
+from pyface.api import GUI, ApplicationWindow, ProgressDialog
+from pyface.action.api import Action, MenuManager, MenuBarManager
def task_func(t):
progress = ProgressDialog(title="progress", message="counting to %d"%t, max=t, show_time=True, can_cancel=True)
Oops, something went wrong.

0 comments on commit f6ffcd4

Please sign in to comment.