Author: bugman
Date: Thu Sep 4 16:31:00 2014
New Revision: 25629
URL: http://svn.gna.org/viewcvs/relax?rev=25629&view=rev
Log:
Python 3 fixes via the 2to3 compatibility script.
The command used was:
2to3 -w -f except -f import -f imports -f long -f numliterals -f xrange .
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
tags/3.3.0/test_suite/system_tests/relax_disp.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=25629&r1=25628&r2=25629&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:31:00 2014
@@ -9,7 +9,7 @@
from random import gauss, sample, randint, randrange
from collections import OrderedDict
#import pickle
-import cPickle as pickle
+import pickle as pickle
# Should warnings be raised to errors?
raise_warnings = False
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=25629&r1=25628&r2=25629&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:31:00 2014
@@ -4,7 +4,7 @@
# Python module imports.
from collections import OrderedDict
#import pickle
-import cPickle as pickle
+import pickle as pickle
from numpy import array, asarray, diag, ones, std, sqrt
from os import getcwd, makedirs, path, sep
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=25629&r1=25628&r2=25629&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:31:00 2014
@@ -1,7 +1,7 @@
# Python module imports.
from collections import OrderedDict
#import pickle
-import cPickle as 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
@@ -90,7 +90,7 @@
for j in range(nt):
spectrum_id_list.append('%iZ_A%i'%(i, j))
file_name = "ntmax_%i_disp_%i.ser" % (nt_max, i)
- spectrum.read_intensities(file=file_name, dir=data_path,
spectrum_id=spectrum_id_list, int_method='height', int_col=range(nt))
+ spectrum.read_intensities(file=file_name, dir=data_path,
spectrum_id=spectrum_id_list, int_method='height', int_col=list(range(nt)))
for j in range(nt):
spectrum_id = '%iZ_A%i'%(i, j)
Modified: tags/3.3.0/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/tags/3.3.0/test_suite/system_tests/relax_disp.py?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- tags/3.3.0/test_suite/system_tests/relax_disp.py (original)
+++ tags/3.3.0/test_suite/system_tests/relax_disp.py Thu Sep 4 16:31:00 2014
@@ -8154,7 +8154,7 @@
# Make Carlo Simulations number
- mc_number_list = range(0, 1000, 250)
+ mc_number_list = list(range(0, 1000, 250))
sim_attr_list = ['chi2_sim', 'f_count_sim', 'g_count_sim',
'h_count_sim', 'i0_sim', 'iter_sim', 'peak_intensity_sim', 'r2eff_sim',
'select_sim', 'warning_sim']
_______________________________________________
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
