timechart: change import strategy

old strategy seems to fail on recent version of python

Signed-off-by: Pierre Tardy <tardyp@gmail.com>

8 files changed, 48 insertions, 45 deletions

diff --git a/timechart.py b/timechart.py
index febcbb2..59711a5 100755
--- a/timechart.py
+++ b/timechart.py
@@ -26,5 +26,7 @@ if __name__ == '__main__':
         else:
             gui.start_event_loop()
 
+import timechart.py2exe_wximports
+
 ##### EOF #####################################################################
 
diff --git a/timechart/__init__.py b/timechart/__init__.py
index fc6566b..7e89367 100755
--- a/timechart/__init__.py
+++ b/timechart/__init__.py
@@ -3,33 +3,3 @@ try:
 except:
     pass
 
-# for py2exe.
-try:
-    import enthought.pyface.ui.wx.about_dialog
-    import enthought.pyface.ui.wx.application_window
-    import enthought.pyface.ui.wx.clipboard
-    import enthought.pyface.ui.wx.confirmation_dialog
-    import enthought.pyface.ui.wx.dialog
-    import enthought.pyface.ui.wx.directory_dialog
-    import enthought.pyface.ui.wx.file_dialog
-    import enthought.pyface.ui.wx.gui
-    import enthought.pyface.ui.wx.heading_text
-    import enthought.pyface.ui.wx.image_cache
-    import enthought.pyface.ui.wx.image_resource
-    import enthought.pyface.ui.wx.__init__
-    import enthought.pyface.ui.wx.init
-    import enthought.pyface.ui.wx.ipython_widget
-    import enthought.pyface.ui.wx.message_dialog
-    import enthought.pyface.ui.wx.progress_dialog
-    import enthought.pyface.ui.wx.python_editor
-    import enthought.pyface.ui.wx.python_shell
-    import enthought.pyface.ui.wx.resource_manager
-    import enthought.pyface.ui.wx.splash_screen
-    import enthought.pyface.ui.wx.split_widget
-    import enthought.pyface.ui.wx.system_metrics
-    import enthought.pyface.ui.wx.widget
-    import enthought.pyface.ui.wx.window
-    import enthought.pyface.ui.wx.window
-except:
- pass
-
diff --git a/timechart/model.py b/timechart/model.py
index 029bb15..5b00a14 100644
--- a/timechart/model.py
+++ b/timechart/model.py
@@ -8,8 +8,8 @@ from enthought.traits.api import HasTraits, Instance, Str, Float,Delegate,\
     DelegatesTo, Int, Long, Enum, Color, List, Bool, CArray, Property, cached_property, String, Button
 from enthought.traits.ui.api import Group, HGroup, Item, View, spring, Handler,VGroup,TableEditor
 from enthought.enable.colors import ColorTrait
-from timechart.process_table import process_table_editor
-from timechart import colors
+from process_table import process_table_editor
+import colors
 
 import numpy
 import sys
@@ -400,7 +400,7 @@ class tcProject(HasTraits):
             method = getattr(self, name)
             if callable(method):
                 self.methods[name] = method
-        from timechart import plugin
+        import plugin
         colors.parse_colors(plugin.get_plugins_additional_colors())
         self.plugin_methods = plugin.get_plugins_additional_methods()
         self.process_types = {
diff --git a/timechart/plot.py b/timechart/plot.py
index e7606ff..12fcc79 100644
--- a/timechart/plot.py
+++ b/timechart/plot.py
@@ -11,9 +11,9 @@ from enthought.chaco.label import Label
 from enthought.kiva.traits.kiva_font_trait import KivaFont
 from enthought.enable.api import black_color_trait, KeySpec
 
-from timechart.model import tcProject
-from timechart.colors import get_aggcolor_by_id
-from timechart import tools
+from model import tcProject
+from colors import get_aggcolor_by_id
+import tools
 from numpy import linspace,arange,amin,amax
 from math import log
 from numpy import array, ndarray,argmax,searchsorted,mean
diff --git a/timechart/plugin.py b/timechart/plugin.py
index a84655a..4dce568 100644
--- a/timechart/plugin.py
+++ b/timechart/plugin.py
@@ -38,8 +38,9 @@ def get_plugins_additional_ftrace_parsers():
     for p in plugin_list:
         s += p.additional_ftrace_parsers
     return s
-import timechart.plugins,os
-for f in os.listdir(os.path.abspath(timechart.plugins.__path__[0])):
+import plugins
+import os
+for f in os.listdir(os.path.abspath(plugins.__path__[0])):
     module_name, ext = os.path.splitext(f)
     if (not module_name.startswith(".")) and ext == '.py' and module_name != "__init__":
         module = __import__("timechart.plugins."+module_name)
diff --git a/timechart/process_table.py b/timechart/process_table.py
index 7902c40..1fe583c 100644
--- a/timechart/process_table.py
+++ b/timechart/process_table.py
@@ -1,4 +1,5 @@
-from timechart import colors
+#import timechart.colors as colors
+import colors
 from enthought.traits.ui.table_column   import ObjectColumn, ExpressionColumn
 from enthought.traits.ui.api import TableEditor
 
diff --git a/timechart/py2exe_wximports.py b/timechart/py2exe_wximports.py
new file mode 100644
index 0000000..e488f61
--- /dev/null
+++ b/timechart/py2exe_wximports.py
@@ -0,0 +1,29 @@
+# for py2exe.
+try:
+    import enthought.pyface.ui.wx.about_dialog
+    import enthought.pyface.ui.wx.application_window
+    import enthought.pyface.ui.wx.clipboard
+    import enthought.pyface.ui.wx.confirmation_dialog
+    import enthought.pyface.ui.wx.dialog
+    import enthought.pyface.ui.wx.directory_dialog
+    import enthought.pyface.ui.wx.file_dialog
+    import enthought.pyface.ui.wx.gui
+    import enthought.pyface.ui.wx.heading_text
+    import enthought.pyface.ui.wx.image_cache
+    import enthought.pyface.ui.wx.image_resource
+    import enthought.pyface.ui.wx.__init__
+    import enthought.pyface.ui.wx.init
+    import enthought.pyface.ui.wx.ipython_widget
+    import enthought.pyface.ui.wx.message_dialog
+    import enthought.pyface.ui.wx.progress_dialog
+    import enthought.pyface.ui.wx.python_editor
+    import enthought.pyface.ui.wx.python_shell
+    import enthought.pyface.ui.wx.resource_manager
+    import enthought.pyface.ui.wx.splash_screen
+    import enthought.pyface.ui.wx.split_widget
+    import enthought.pyface.ui.wx.system_metrics
+    import enthought.pyface.ui.wx.widget
+    import enthought.pyface.ui.wx.window
+    import enthought.pyface.ui.wx.window
+except:
+ pass
diff --git a/timechart/window.py b/timechart/window.py
index 015b108..c92ebe8 100644
--- a/timechart/window.py
+++ b/timechart/window.py
@@ -2,8 +2,8 @@ import sys,os
 from enthought.traits.api import  HasTraits,Str
 from enthought.traits.ui.api import InstanceEditor,Item,View,HSplit,VSplit,Handler, StatusItem
 from enthought.traits.ui.menu import Action, MenuBar, ToolBar, Menu
-from timechart.model import tcProject
-from timechart.plot import tcPlot, create_timechart_container
+from model import tcProject
+from plot import tcPlot, create_timechart_container
 from enthought.enable.component_editor import ComponentEditor
 
 # workaround bug in kiva's font manager that fails to find a correct default font on linux
@@ -79,11 +79,11 @@ def open_dialog():
 
     dlg.Destroy()
     return rv
-    
+
 def open_file(fn=None):
-    from timechart.backends.perf import detect_perf
-    from timechart.backends.ftrace import detect_ftrace
-    from timechart.backends.tracecmd import detect_tracecmd
+    from backends.perf import detect_perf
+    from backends.ftrace import detect_ftrace
+    from backends.tracecmd import detect_tracecmd
     if fn == None:
         fn = open_dialog()
         if fn == None: