r18137 - in /branches/frame_order_testing: ./ relax_errors.py -- December 14, 2012 - 10:15

Author: bugman
Date: Fri Dec 14 10:15:03 2012
New Revision: 18137

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

........
  r18136 | bugman | 2012-12-14 10:14:37 +0100 (Fri, 14 Dec 2012) | 3 lines
  
  Bug fix for the RelaxNoAlignError error class - the printout statement was 
broken.
........

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

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec 14 10:15:03 2012
@@ -1,1 +1,1 @@
-/trunk:1-18133
+/trunk:1-18136

Modified: branches/frame_order_testing/relax_errors.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax_errors.py?rev=18137&r1=18136&r2=18137&view=diff
==============================================================================
--- branches/frame_order_testing/relax_errors.py (original)
+++ branches/frame_order_testing/relax_errors.py Fri Dec 14 10:15:03 2012
@@ -750,8 +750,11 @@
 
 # No alignment data.
 class RelaxNoAlignError(BaseError):
-    def __init__(self, align_id, pipe):
-        self.text = "The alignment ID string '%s' is missing from the data 
pipe '%s'." % align_id
+    def __init__(self, align_id, pipe=None):
+        if pipe != None:
+            self.text = "The alignment ID string '%s' is missing from the 
data pipe '%s'." % (align_id, pipe)
+        else:
+            self.text = "The alignment ID string '%s' is missing." % align_id
 
 # Alignment data already exists.
 class RelaxAlignError(BaseError):