Absolute toolkit imports.

enthought · Aug 17, 2015 · 665c35d · 665c35d
1 parent c66b33c
commit 665c35d
Show file tree

Hide file tree

Showing 23 changed files with 69 additions and 23 deletions.
diff --git a/pyface/about_dialog.py b/pyface/about_dialog.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 AboutDialog = toolkit_object('about_dialog:AboutDialog')
 
 ### EOF #######################################################################
diff --git a/pyface/application_window.py b/pyface/application_window.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 ApplicationWindow = toolkit_object('application_window:ApplicationWindow')
 
 #### EOF ######################################################################
diff --git a/pyface/beep.py b/pyface/beep.py
@@ -3,5 +3,7 @@
 """Sound the system bell."""
 
 # Import the toolkit-specific version
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 beep = toolkit_object('beep:beep')
diff --git a/pyface/clipboard.py b/pyface/clipboard.py
@@ -16,7 +16,9 @@
 """
 
 # Import the toolkit specific version
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 Clipboard = toolkit_object('clipboard:Clipboard')
 
 # Create a singleton clipboard object for convenience

diff --git a/pyface/confirmation_dialog.py b/pyface/confirmation_dialog.py
@@ -36,7 +36,9 @@ def confirm(parent, message, title=None, cancel=False, default=NO):
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 ConfirmationDialog = toolkit_object('confirmation_dialog:ConfirmationDialog')
 
 #### EOF ######################################################################
diff --git a/pyface/dialog.py b/pyface/dialog.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 Dialog = toolkit_object('dialog:Dialog')
 
 #### EOF ######################################################################
diff --git a/pyface/directory_dialog.py b/pyface/directory_dialog.py
@@ -17,7 +17,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 DirectoryDialog = toolkit_object('directory_dialog:DirectoryDialog')
 
 #### EOF ######################################################################
diff --git a/pyface/file_dialog.py b/pyface/file_dialog.py
@@ -16,7 +16,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 FileDialog = toolkit_object('file_dialog:FileDialog')
 
 #### EOF ######################################################################
diff --git a/pyface/gui.py b/pyface/gui.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 GUI = toolkit_object('gui:GUI')
 
 #### EOF ######################################################################
diff --git a/pyface/heading_text.py b/pyface/heading_text.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 HeadingText = toolkit_object('heading_text:HeadingText')
 
 #### EOF ######################################################################
diff --git a/pyface/image_cache.py b/pyface/image_cache.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 ImageCache = toolkit_object('image_cache:ImageCache')
 
 #### EOF ######################################################################
diff --git a/pyface/image_resource.py b/pyface/image_resource.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 ImageResource = toolkit_object('image_resource:ImageResource')
 
 #### EOF ######################################################################
diff --git a/pyface/ipython_widget.py b/pyface/ipython_widget.py
@@ -24,5 +24,7 @@
 You need to have ipython >= 0.9 installed to use the ipython widget.'''
 
 
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 IPythonWidget= toolkit_object('ipython_widget:IPythonWidget')
diff --git a/pyface/message_dialog.py b/pyface/message_dialog.py
@@ -47,7 +47,9 @@ def error(parent, message, title='Error'):
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 MessageDialog = toolkit_object('message_dialog:MessageDialog')
 
 #### EOF ######################################################################
diff --git a/pyface/progress_dialog.py b/pyface/progress_dialog.py
@@ -16,7 +16,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 ProgressDialog = toolkit_object('progress_dialog:ProgressDialog')
 
 #### EOF ######################################################################
diff --git a/pyface/python_editor.py b/pyface/python_editor.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 PythonEditor = toolkit_object('python_editor:PythonEditor')
 
 #### EOF ######################################################################
diff --git a/pyface/python_shell.py b/pyface/python_shell.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 PythonShell = toolkit_object('python_shell:PythonShell')
 
 #### EOF ######################################################################
diff --git a/pyface/resource_manager.py b/pyface/resource_manager.py
@@ -19,7 +19,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 PyfaceResourceFactory = toolkit_object('resource_manager:PyfaceResourceFactory')
 
 

diff --git a/pyface/splash_screen.py b/pyface/splash_screen.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 SplashScreen = toolkit_object('splash_screen:SplashScreen')
 
 #### EOF ######################################################################
diff --git a/pyface/split_widget.py b/pyface/split_widget.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 SplitWidget = toolkit_object('split_widget:SplitWidget')
 
 #### EOF ######################################################################
diff --git a/pyface/system_metrics.py b/pyface/system_metrics.py
@@ -17,7 +17,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 SystemMetrics = toolkit_object('system_metrics:SystemMetrics')
 
 #### EOF ######################################################################
diff --git a/pyface/widget.py b/pyface/widget.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 Widget = toolkit_object('widget:Widget')
 
 #### EOF ######################################################################
diff --git a/pyface/window.py b/pyface/window.py
@@ -15,7 +15,9 @@
 
 
 # Import the toolkit specific version.
-from toolkit import toolkit_object
+from __future__ import absolute_import
+
+from .toolkit import toolkit_object
 Window = toolkit_object('window:Window')
 
 #### EOF ######################################################################