Author: bugman
Date: Mon Nov 10 23:43:15 2014
New Revision: 26501
URL: http://svn.gna.org/viewcvs/relax?rev=26501&view=rev
Log:
Python 3 fixes for the relax codebase.
These changes were made using the command:
2to3 -j 4 -w -f buffer -f idioms -f set_literal -f ws_comma -x except -x import
-x imports -x long -x numliterals -x xrange .
Modified:
trunk/auto_analyses/relax_disp_repeat_cpmg.py
trunk/test_suite/shared_data/dispersion/profiling/base.py
trunk/test_suite/shared_data/user_functions/uf_list_1_2.py
Modified: trunk/auto_analyses/relax_disp_repeat_cpmg.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/relax_disp_repeat_cpmg.py?rev=26501&r1=26500&r2=26501&view=diff
==============================================================================
--- trunk/auto_analyses/relax_disp_repeat_cpmg.py (original)
+++ trunk/auto_analyses/relax_disp_repeat_cpmg.py Mon Nov 10 23:43:15 2014
@@ -2243,8 +2243,8 @@
# Linear a, with no intercept.
a = sum(x * y) / sum(x**2)
- min_xy = min(concatenate((x,y)))
- max_xy = max(concatenate((x,y)))
+ min_xy = min(concatenate((x, y)))
+ max_xy = max(concatenate((x, y)))
dx = (max_xy - min_xy) / np
x_arange = arange(min_xy, max_xy + dx, dx)
@@ -2264,8 +2264,8 @@
# kex has values in 1000 area.
if param == 'kex':
- ax.ticklabel_format(style='sci', axis='x', scilimits=(0,0))
- ax.ticklabel_format(style='sci', axis='y', scilimits=(0,0))
+ ax.ticklabel_format(style='sci', axis='x', scilimits=(0,
0))
+ ax.ticklabel_format(style='sci', axis='y', scilimits=(0,
0))
## If r2 or dw parameter, do a straight line:
#if param in PARAMS_R20 + ['dw']:
Modified: trunk/test_suite/shared_data/dispersion/profiling/base.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/profiling/base.py?rev=26501&r1=26500&r2=26501&view=diff
==============================================================================
--- trunk/test_suite/shared_data/dispersion/profiling/base.py (original)
+++ trunk/test_suite/shared_data/dispersion/profiling/base.py Mon Nov 10
23:43:15 2014
@@ -131,8 +131,8 @@
"""
# Strip out trailing zeros.
- version1 = sub(r'(\.0+)*$','', version1)
- version2 = sub(r'(\.0+)*$','', version2)
+ version1 = sub(r'(\.0+)*$', '', version1)
+ version2 = sub(r'(\.0+)*$', '', version2)
# Convert to a list of numbers.
version1 = [int(val) for val in version1.split('.')]
Modified: trunk/test_suite/shared_data/user_functions/uf_list_1_2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/user_functions/uf_list_1_2.py?rev=26501&r1=26500&r2=26501&view=diff
==============================================================================
--- trunk/test_suite/shared_data/user_functions/uf_list_1_2.py (original)
+++ trunk/test_suite/shared_data/user_functions/uf_list_1_2.py Mon Nov 10
23:43:15 2014
@@ -22,10 +22,9 @@
self.interpreter.run()
# Get the names of the data structures.
- names = self.local.keys()
+ names = sorted(self.local.keys())
# Alphabetically sort the names of the data structures.
- names.sort()
# Alphabetically sort the names of the data structures.
for name in names:
_______________________________________________
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
