r7337 - /1.3/specific_fns/model_free/main.py -- September 26, 2008 - 14:38

Author: bugman
Date: Fri Sep 26 14:38:50 2008
New Revision: 7337

URL: http://svn.gna.org/viewcvs/relax?rev=7337&view=rev
Log:
Another fix for the structural object comparison in duplicate_data().


Modified:
    1.3/specific_fns/model_free/main.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=7337&r1=7336&r2=7337&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Fri Sep 26 14:38:50 2008
@@ -1045,6 +1045,10 @@
                 for data_name in dir(ds[pipe_from].structure):
                     # Skip special objects (starting with _, or in the 
original class and base class namespaces).
                     if search('^_', data_name) or data_name in 
ds[pipe_from].structure.__class__.__dict__.keys() or data_name in 
ds[pipe_from].structure.__class__.__bases__[0].__dict__.keys():
+                        continue
+
+                    # Skip some more special objects.
+                    if data_name in ['structural_data']:
                         continue
 
                     # Get the original object.