r14805 - /1.3/test_suite/relax_test_runner.py -- October 06, 2011 - 12:15

Author: bugman
Date: Thu Oct  6 12:15:58 2011
New Revision: 14805

URL: http://svn.gna.org/viewcvs/relax?rev=14805&view=rev
Log:
Bug fix for a newly introduced dependency on the wxPython module.

This wx module is now optional, and only required for the GUI mode.  This 
allows relax to run
without this module installed.


Modified:
    1.3/test_suite/relax_test_runner.py

Modified: 1.3/test_suite/relax_test_runner.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/relax_test_runner.py?rev=14805&r1=14804&r2=14805&view=diff
==============================================================================
--- 1.3/test_suite/relax_test_runner.py (original)
+++ 1.3/test_suite/relax_test_runner.py Thu Oct  6 12:15:58 2011
@@ -21,6 +21,7 @@
 
###############################################################################
 
 # Python module imports.
+import dep_check
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -31,7 +32,8 @@
 except ImportError:
     from unittest import _TextTestResult as TextTestResult    # Python 2.6 
and below.
 from unittest import TextTestRunner
-import wx
+if dep_check.wx_module:
+    import wx
 
 # relax module imports.
 from status import Status; status = Status()