r17194 - in /branches/frame_order_testing: ./ data/prototype.py relax_errors.py -- July 04, 2012 - 12:22

Author: bugman
Date: Wed Jul  4 12:22:06 2012
New Revision: 17194

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

........
  r17139 | bugman | 2012-07-02 21:36:49 +0200 (Mon, 02 Jul 2012) | 6 lines
  
  The spin container hidden objects are now replicated when the object is 
copied.
  
  The old Prototype.__deepcopy__() method was skipping all hidden objects, 
but now only objects
  starting with '__' are skipped.
........
  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/frame_order_testing/   (props changed)
    branches/frame_order_testing/data/prototype.py
    branches/frame_order_testing/relax_errors.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul  4 12:22:06 2012
@@ -1,1 +1,1 @@
-/trunk:1-17117
+/trunk:1-17117,17139-17142

Modified: branches/frame_order_testing/data/prototype.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/prototype.py?rev=17194&r1=17193&r2=17194&view=diff
==============================================================================
--- branches/frame_order_testing/data/prototype.py (original)
+++ branches/frame_order_testing/data/prototype.py Wed Jul  4 12:22:06 2012
@@ -40,8 +40,8 @@
 
         # Loop over all objects in self and make deepcopies of them.
         for name in dir(self):
-            # Skip all names begining with '_'.
-            if search('^_', name):
+            # Skip all names begining with '__'.
+            if search('^__', name):
                 continue
 
             # Skip the class methods.

Modified: branches/frame_order_testing/relax_errors.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax_errors.py?rev=17194&r1=17193&r2=17194&view=diff
==============================================================================
--- branches/frame_order_testing/relax_errors.py (original)
+++ branches/frame_order_testing/relax_errors.py Wed Jul  4 12:22:06 2012
@@ -273,8 +273,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):