r4005 - in /branches/N_state_model: ./ relax_errors.py -- November 26, 2007 - 14:28

Author: bugman
Date: Mon Nov 26 14:28:00 2007
New Revision: 4005

URL: http://svn.gna.org/viewcvs/relax?rev=4005&view=rev
Log:
Merged revisions 4004 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r4004 | bugman | 2007-11-26 14:26:55 +0100 (Mon, 26 Nov 2007) | 3 lines
  
  Improvement of the RelaxUnknownParamError printout.
........

Modified:
    branches/N_state_model/   (props changed)
    branches/N_state_model/relax_errors.py

Propchange: branches/N_state_model/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 26 14:28:00 2007
@@ -1,1 +1,1 @@
-/1.3:1-3692,3695,3697-3713,3715-3719,3721-3728,3730-3731,3733-3755,3757-3807,3809-3833,3836-3838,3840-3869,3872-3905,3907-3986
+/1.3:1-3692,3695,3697-3713,3715-3719,3721-3728,3730-3731,3733-3755,3757-3807,3809-3833,3836-3838,3840-3869,3872-3905,3907-3986,4004

Modified: branches/N_state_model/relax_errors.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/relax_errors.py?rev=4005&r1=4004&r2=4005&view=diff
==============================================================================
--- branches/N_state_model/relax_errors.py (original)
+++ branches/N_state_model/relax_errors.py Mon Nov 26 14:28:00 2007
@@ -628,10 +628,10 @@
 # Unknown parameter.
 class RelaxUnknownParamError(BaseError):
     def __init__(self, name, param_type=None):
-        if param_type:
-            self.text = "The " + param_type + " parameter " + `name` + " is 
unknown."
+        if param_type != None:
+            self.text = "The " + name + " parameter, " + `param_type` + ", 
is unknown."
         else:
-            self.text = "The parameter " + `name` + " is unknown."
+            self.text = "The " + name + " parameter is unknown."
         if Debug:
             self.save_state()