r19358 - in /branches/relax_disp: ./ lib/software/sparky.py test_suite/unit_tests/_lib/_software/__init__.py -- April 04, 2013 - 15:40

Author: bugman
Date: Thu Apr  4 15:40:00 2013
New Revision: 19358

URL: http://svn.gna.org/viewcvs/relax?rev=19358&view=rev
Log:
Merged revisions 19356-19357 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19356 | bugman | 2013-04-04 15:34:22 +0200 (Thu, 04 Apr 2013) | 3 lines
  
  Updated the unit test lib.software package __all__ list.
........
  r19357 | bugman | 2013-04-04 15:34:37 +0200 (Thu, 04 Apr 2013) | 3 lines
  
  Missing import for the lib.software.sparky module.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/lib/software/sparky.py
    branches/relax_disp/test_suite/unit_tests/_lib/_software/__init__.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr  4 15:40:00 2013
@@ -1,1 +1,1 @@
-/trunk:1-19354
+/trunk:1-19357

Modified: branches/relax_disp/lib/software/sparky.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/software/sparky.py?rev=19358&r1=19357&r2=19358&view=diff
==============================================================================
--- branches/relax_disp/lib/software/sparky.py (original)
+++ branches/relax_disp/lib/software/sparky.py Thu Apr  4 15:40:00 2013
@@ -29,7 +29,7 @@
 
 # relax module imports.
 from lib.errors import RelaxError
-from lib.io import strip
+from lib.io import open_write_file, strip
 
 
 def read_list_intensity(file_data=None, int_col=None):

Modified: branches/relax_disp/test_suite/unit_tests/_lib/_software/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/unit_tests/_lib/_software/__init__.py?rev=19358&r1=19357&r2=19358&view=diff
==============================================================================
--- branches/relax_disp/test_suite/unit_tests/_lib/_software/__init__.py 
(original)
+++ branches/relax_disp/test_suite/unit_tests/_lib/_software/__init__.py Thu 
Apr  4 15:40:00 2013
@@ -22,5 +22,6 @@
 
 __all__ = [
     '_opendx',
-    'test___init__'
+    'test___init__',
+    'test_sparky'
 ]