r17721 - /trunk/generic_fns/state.py -- October 07, 2012 - 18:59

Author: bugman
Date: Sun Oct  7 18:59:12 2012
New Revision: 17721

URL: http://svn.gna.org/viewcvs/relax?rev=17721&view=rev
Log:
Removed the ability to save and restore states using the pickle module.

A pickled state is of no use to relax anymore.  It's removal is needed for 
Python 3 support.  So now
everything defaults to the XML formatted output.


Modified:
    trunk/generic_fns/state.py

Modified: trunk/generic_fns/state.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/state.py?rev=17721&r1=17720&r2=17721&view=diff
==============================================================================
--- trunk/generic_fns/state.py (original)
+++ trunk/generic_fns/state.py Sun Oct  7 18:59:12 2012
@@ -23,10 +23,6 @@
 """Module for reading and writing the relax program state."""
 
 # Python module imports.
-try:
-    from cPickle import dump, load    # Python 2 import.
-except ImportError:
-    from pickle import dump, load    # Python 3 import.
 from re import search
 
 # relax module imports.
@@ -35,33 +31,6 @@
 from relax_errors import RelaxError
 from relax_io import open_read_file, open_write_file
 from status import Status; status = Status()
-
-
-def determine_format(file):
-    """Determine the format of the state file.
-
-    @keyword file:  The file object representing the state file.
-    @type file:     file object
-    @return:        The state format.  This can be 'xml' or 'pickle'.
-    @rtype:         str or None
-    """
-
-    # 1st line.
-    header = file.readline()
-    header = header[:-1]    # Strip the trailing newline.
-    if hasattr(header, 'decode'):     # Python 3 byte type conversion.
-        header = header.decode()
-
-    # Be nice and go back to the start of the file.
-    file.seek(0)
-
-    # XML.
-    if search(r"<\?xml", header):
-        return 'xml'
-
-    # Pickle.
-    elif search("ccopy_reg", header):
-        return 'pickle'
 
 
 def load_pickle(file):
@@ -120,9 +89,6 @@
     # Open the file for reading.
     file = open_read_file(file_name=state, dir=dir, verbosity=verbosity)
 
-    # Determine the format of the file.
-    format = determine_format(file)
-
     # Reset.
     if force:
         reset()
@@ -131,17 +97,8 @@
     if not ds.is_empty():
         raise RelaxError("The relax data store is not empty.")
 
-    # XML state.
-    if format == 'xml':
-        ds.from_xml(file)
-
-    # Pickled state.
-    elif format == 'pickle':
-        load_pickle(file)
-
-    # Bad state file.
-    else:
-        raise RelaxError("The saved state " + repr(state) + " is not 
compatible with this version of relax.")
+    # Restore from the XML.
+    ds.from_xml(file)
 
     # Signal a change in the current data pipe.
     status.observers.pipe_alteration.notify()
@@ -150,7 +107,7 @@
     status.observers.state_load.notify()
 
 
-def save_state(state=None, dir=None, compress_type=1, verbosity=1, 
force=False, pickle=False):
+def save_state(state=None, dir=None, compress_type=1, verbosity=1, 
force=False):
     """Function for saving the program state.
 
     @keyword state:         The saved state file.
@@ -170,13 +127,8 @@
     # Open the file for writing.
     file = open_write_file(file_name=state, dir=dir, verbosity=verbosity, 
force=force, compress_type=compress_type)
 
-    # Pickle the data class and write it to file
-    if pickle:
-        dump(ds, file, 1)
-
-    # Otherwise save as XML.
-    else:
-        ds.to_xml(file)
+    # Save as XML.
+    ds.to_xml(file)
 
     # Close the file.
     file.close()