Author: bugman
Date: Wed Sep 4 09:32:08 2013
New Revision: 20786
URL: http://svn.gna.org/viewcvs/relax?rev=20786&view=rev
Log:
Merged revisions 20785 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r20785 | bugman | 2013-09-04 09:29:14 +0200 (Wed, 04 Sep 2013) | 19 lines
Python 3 fixes.
The command used was:
2to3 -j 8 -w \
-f buffer \
-f idioms \
-f set_literal \
-f ws_comma \
-x except \
-x import \
-x imports \
-x long \
-x numliterals \
-x xrange \
.
The compat.py and multi/processor.py files were reverted prior to
committing.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/devel_scripts/python_seek.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Sep 4 09:32:08 2013
@@ -1,1 +1,1 @@
-/trunk:1-20782
+/trunk:1-20785
Modified: branches/relax_disp/devel_scripts/python_seek.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/devel_scripts/python_seek.py?rev=20786&r1=20785&r2=20786&view=diff
==============================================================================
--- branches/relax_disp/devel_scripts/python_seek.py (original)
+++ branches/relax_disp/devel_scripts/python_seek.py Wed Sep 4 09:32:08 2013
@@ -97,7 +97,7 @@
file = line[:-1]
# Recursively follow and expand links.
- while 1:
+ while True:
if islink(file):
orig = readlink(file)
if not isabs(orig):
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py?rev=20786&r1=20785&r2=20786&view=diff
==============================================================================
---
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
(original)
+++
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
Wed Sep 4 09:32:08 2013
@@ -74,7 +74,7 @@
red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom']
for i in range(len(full)):
# Initialise the reduced tensor.
- align_tensor.init(tensor=red[i], params=(0,0,0,0,0))
+ align_tensor.init(tensor=red[i], params=(0, 0, 0, 0, 0))
# Set the domain info.
align_tensor.set_domain(tensor=full[i], domain='N')
r20786 - in /branches/relax_disp: ./ devel_scripts/ test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/