Author: bugman Date: Fri Sep 11 11:39:53 2009 New Revision: 9514 URL: http://svn.gna.org/viewcvs/relax?rev=9514&view=rev Log: Fixes for load_pickle(). The ds.__reset__() call has been removed because of redundancy and the new ds.is_empty() has been blacklisted. Modified: 1.3/generic_fns/state.py Modified: 1.3/generic_fns/state.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/state.py?rev=9514&r1=9513&r2=9514&view=diff ============================================================================== --- 1.3/generic_fns/state.py (original) +++ 1.3/generic_fns/state.py Fri Sep 11 11:39:53 2009 @@ -71,11 +71,8 @@ # Close the file. file.close() - # Reset the relax data storage object. - ds.__reset__() - # Black list of objects (all dict objects, non-modifiable objects, data store specific methods, and other special objects). - black_list = dir(dict) + ['__weakref__', '__dict__', '__module__', '__reset__', 'add', 'from_xml', 'to_xml'] + black_list = dir(dict) + ['__weakref__', '__dict__', '__module__', '__reset__', 'add', 'from_xml', 'is_empty', 'to_xml'] # Loop over the objects in the saved state, and dump them into the relax data store. for name in dir(state):