Author: bugman
Date: Thu Sep 4 16:33:24 2014
New Revision: 25630
URL: http://svn.gna.org/viewcvs/relax?rev=25630&view=rev
Log:
Python 2 vs. 3 compatibility fix for the pickle module.
This is for the estimate_errors*.py scripts in the directory
test_suite/shared_data/curve_fitting/numeric_topology/. The lib.compat.pickle
module is now used to
allow both Python versions to run relax.
Modified:
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
Modified:
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
URL:
http://svn.gna.org/viewcvs/relax/tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py?rev=25630&r1=25629&r2=25630&view=diff
==============================================================================
---
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
(original)
+++
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
Thu Sep 4 16:33:24 2014
@@ -8,8 +8,9 @@
from numpy.ma import fix_invalid
from random import gauss, sample, randint, randrange
from collections import OrderedDict
-#import pickle
-import pickle as pickle
+
+# relax module imports.
+from lib.compat import pickle
# Should warnings be raised to errors?
raise_warnings = False
@@ -366,4 +367,4 @@
dic[i]['sigma_I0_sim'] = sigma_I0_sim
# Write to pickle.
- pickle.dump( dic, open( "estimate_errors_data_nt%i.cp"%nt_max, "wb" ) )
+ pickle.dump( dic, open( "estimate_errors_data_nt%i.cp"%nt_max, "wb" ) )
Modified:
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
URL:
http://svn.gna.org/viewcvs/relax/tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py?rev=25630&r1=25629&r2=25630&view=diff
==============================================================================
---
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
(original)
+++
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
Thu Sep 4 16:33:24 2014
@@ -3,10 +3,11 @@
# Python module imports.
from collections import OrderedDict
-#import pickle
-import pickle as pickle
from numpy import array, asarray, diag, ones, std, sqrt
from os import getcwd, makedirs, path, sep
+
+# relax module imports.
+from lib.compat import pickle
# Open data.
dic_s = pickle.load( open( "estimate_errors_data_settings.cp", "rb" ) )
Modified:
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
URL:
http://svn.gna.org/viewcvs/relax/tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py?rev=25630&r1=25629&r2=25630&view=diff
==============================================================================
---
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
(original)
+++
tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
Thu Sep 4 16:33:24 2014
@@ -1,13 +1,14 @@
# Python module imports.
from collections import OrderedDict
-#import pickle
-import pickle as pickle
from numpy import array, asarray, diag, ones, std, sqrt
from numpy.random import normal
from minfx.generic import generic_minimise
from os import getcwd, makedirs, path, sep
from random import gauss
from tempfile import mkdtemp, NamedTemporaryFile
+
+# relax module imports.
+from lib.compat import pickle
# relax imports
from status import Status; status = Status()
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
