r17879 - in /trunk: gui/__init__.py test_suite/test_suite_runner.py -- October 16, 2012 - 23:30

Author: bugman
Date: Tue Oct 16 23:30:35 2012
New Revision: 17879

URL: http://svn.gna.org/viewcvs/relax?rev=17879&view=rev
Log:
API documentation fix - a circular import has been broken.

This was only a circular import when the gui package is imported from an 
external program like
Epydoc.


Modified:
    trunk/gui/__init__.py
    trunk/test_suite/test_suite_runner.py

Modified: trunk/gui/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/__init__.py?rev=17879&r1=17878&r2=17879&view=diff
==============================================================================
--- trunk/gui/__init__.py (original)
+++ trunk/gui/__init__.py Tue Oct 16 23:30:35 2012
@@ -38,10 +38,10 @@
 import generic_fns
 from graphics import IMAGE_PATH
 from relax_errors import RelaxError
-from relax_gui import Main
 from status import Status; status = Status()
 
 # relax GUI module imports.
+import gui
 from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
 
 
@@ -100,7 +100,7 @@
         self.show_splash()
 
         # Build the GUI.
-        self.gui = Main(parent=None, id=-1, title="")
+        self.gui = gui.relax_gui.Main(parent=None, id=-1, title="")
 
         # Make it the main application component.
         self.SetTopWindow(self.gui)

Modified: trunk/test_suite/test_suite_runner.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/test_suite_runner.py?rev=17879&r1=17878&r2=17879&view=diff
==============================================================================
--- trunk/test_suite/test_suite_runner.py (original)
+++ trunk/test_suite/test_suite_runner.py Tue Oct 16 23:30:35 2012
@@ -39,8 +39,7 @@
 
 # relax module imports.
 if dep_check.wx_module:
-    from gui.interpreter import Interpreter
-    from gui.relax_gui import Main
+    import gui
 from test_suite.relax_test_runner import GuiTestRunner, RelaxTestRunner
 from status import Status; status = Status()
 
@@ -121,7 +120,7 @@
                 app = wx.App(redirect=False)
 
                 # Build the GUI.
-                app.gui = Main(parent=None, id=-1, title="")
+                app.gui = gui.relax_gui.Main(parent=None, id=-1, title="")
 
             # Execute the GUI tests.
             gui_runner = GUI_test_runner()
@@ -130,7 +129,7 @@
             # Clean up for the GUI, if not in GUI mode.
             if status.test_mode:
                 # Terminate the interpreter thread to allow the tests to 
cleanly exit.
-                interpreter = Interpreter()
+                interpreter = gui.interpreter.Interpreter()
                 interpreter.exit()
 
                 # Stop the GUI main loop.