r21821 - in /trunk/lib/spectrum: nmrpipe.py sparky.py -- December 06, 2013 - 11:26

Author: tlinnet
Date: Fri Dec  6 11:26:35 2013
New Revision: 21821

URL: http://svn.gna.org/viewcvs/relax?rev=21821&view=rev
Log:
Fix for calling the warn() function.

Work in progress for Support Request #3044, 
(https://gna.org/support/index.php?3044) - Load spins from SPARKY list.

Modified:
    trunk/lib/spectrum/nmrpipe.py
    trunk/lib/spectrum/sparky.py

Modified: trunk/lib/spectrum/nmrpipe.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/nmrpipe.py?rev=21821&r1=21820&r2=21821&view=diff
==============================================================================
--- trunk/lib/spectrum/nmrpipe.py (original)
+++ trunk/lib/spectrum/nmrpipe.py Fri Dec  6 11:26:35 2013
@@ -120,7 +120,7 @@
         try:
             res_name1 = row1[-4]
         except:
-            raise warn(RelaxWarning("Improperly formatted NMRPipe SeriesTab 
file, cannot process the assignment '%s' for residue name dimension 
1.\nSetting residue name to None." % line[0]))
+            warn(RelaxWarning("Improperly formatted NMRPipe SeriesTab file, 
cannot process the assignment '%s' for residue name dimension 1. Setting 
residue name to None." % line[0]))
             res_name1 = None
 
         # The residue name for dimension 2.

Modified: trunk/lib/spectrum/sparky.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/sparky.py?rev=21821&r1=21820&r2=21821&view=diff
==============================================================================
--- trunk/lib/spectrum/sparky.py (original)
+++ trunk/lib/spectrum/sparky.py Fri Dec  6 11:26:35 2013
@@ -137,7 +137,7 @@
         try:
             res_name = row1[-4]
         except:
-            raise warn(RelaxWarning("Improperly formatted Sparky file, 
cannot process the assignment '%s' for residue name.\nSetting residue name to 
None." % line[0]))
+            warn(RelaxWarning("Improperly formatted Sparky file, cannot 
process the assignment '%s' for residue name. Setting residue name to None." 
% line[0]))
             res_name = None
 
         # Chemical shifts.