r17890 - in /trunk/gui: __init__.py relax_gui.py -- October 17, 2012 - 11:45

Author: bugman
Date: Wed Oct 17 11:45:31 2012
New Revision: 17890

URL: http://svn.gna.org/viewcvs/relax?rev=17890&view=rev
Log:
Another attempt at fixing a nasty circular import in the relax GUI.


Modified:
    trunk/gui/__init__.py
    trunk/gui/relax_gui.py

Modified: trunk/gui/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/__init__.py?rev=17890&r1=17889&r2=17890&view=diff
==============================================================================
--- trunk/gui/__init__.py (original)
+++ trunk/gui/__init__.py Wed Oct 17 11:45:31 2012
@@ -41,7 +41,7 @@
 from status import Status; status = Status()
 
 # relax GUI module imports.
-import gui
+from gui import relax_gui
 from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
 
 
@@ -100,7 +100,7 @@
         self.show_splash()
 
         # Build the GUI.
-        self.gui = gui.relax_gui.Main(parent=None, id=-1, title="")
+        self.gui = relax_gui.Main(parent=None, id=-1, title="")
 
         # Make it the main application component.
         self.SetTopWindow(self.gui)

Modified: trunk/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/relax_gui.py?rev=17890&r1=17889&r2=17890&view=diff
==============================================================================
--- trunk/gui/relax_gui.py (original)
+++ trunk/gui/relax_gui.py Wed Oct 17 11:45:31 2012
@@ -44,7 +44,6 @@
 from relax_errors import RelaxNoPipeError
 from relax_io import io_streams_restore
 from status import Status; status = Status()
-import test_suite.test_suite_runner
 from version import version
 
 # relax GUI module imports.
@@ -587,7 +586,8 @@
         # Prevent all new GUI elements from being shown.
         status.show_gui = False
 
-        # Run the tests.
+        # Run the tests (with the import here to break a nasty circular 
import).
+        import test_suite.test_suite_runner
         runner = test_suite.test_suite_runner.Test_suite_runner([], 
from_gui=True, categories=categories)
         runner.run_all_tests()