Author: bugman Date: Mon Jul 2 22:10:23 2012 New Revision: 17145 URL: http://svn.gna.org/viewcvs/relax?rev=17145&view=rev Log: Merged revisions 17142 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r17142 | bugman | 2012-07-02 22:07:41 +0200 (Mon, 02 Jul 2012) | 5 lines Improvement for the RelaxNoVectorsError class - the data pipe name is now optional. The print outs have been improved as well. ........ Modified: branches/interatomic/ (props changed) branches/interatomic/relax_errors.py Propchange: branches/interatomic/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Jul 2 22:10:23 2012 @@ -1,1 +1,1 @@ -/trunk:1-17139 +/trunk:1-17144 Modified: branches/interatomic/relax_errors.py URL: http://svn.gna.org/viewcvs/relax/branches/interatomic/relax_errors.py?rev=17145&r1=17144&r2=17145&view=diff ============================================================================== --- branches/interatomic/relax_errors.py (original) +++ branches/interatomic/relax_errors.py Mon Jul 2 22:10:23 2012 @@ -302,8 +302,11 @@ # No unit vectors. class RelaxNoVectorsError(BaseError): - def __init__(self, pipe): - self.text = "The unit XH bond vectors for the data pipe " + repr(pipe) + " have not been calculated." + def __init__(self, pipe=None): + if pipe: + self.text = "No unit vectors have been calculated for the data pipe '%s'" % pipe + else: + self.text = "No unit vectors have been calculated." # No chains within the PDB file. class RelaxNoPdbChainError(BaseError):