r19927 - in /branches/relax_disp: ./ devel_scripts/ pipe_control/ specific_analyses/frame_order/ -- June 06, 2013 - 23:31

Author: bugman
Date: Thu Jun  6 23:31:42 2013
New Revision: 19927

URL: http://svn.gna.org/viewcvs/relax?rev=19927&view=rev
Log:
Merged revisions 19926 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19926 | bugman | 2013-06-06 23:19:36 +0200 (Thu, 06 Jun 2013) | 17 lines
  
  Python 3 fixes.
  
  The command used was:
  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:
    branches/relax_disp/   (props changed)
    branches/relax_disp/devel_scripts/broken_branch_recovery.py
    branches/relax_disp/pipe_control/value.py
    branches/relax_disp/specific_analyses/frame_order/__init__.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  6 23:31:42 2013
@@ -1,1 +1,1 @@
-/trunk:1-19924
+/trunk:1-19926

Modified: branches/relax_disp/devel_scripts/broken_branch_recovery.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/devel_scripts/broken_branch_recovery.py?rev=19927&r1=19926&r2=19927&view=diff
==============================================================================
--- branches/relax_disp/devel_scripts/broken_branch_recovery.py (original)
+++ branches/relax_disp/devel_scripts/broken_branch_recovery.py Thu Jun  6 
23:31:42 2013
@@ -16,7 +16,7 @@
 
 # Loop over the lines, extracting all revision numbers which were not 
created by svnmerge.
 index = 0
-while 1:
+while True:
     # All done.
     if index == len(lines) - 1:
         break

Modified: branches/relax_disp/pipe_control/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/value.py?rev=19927&r1=19926&r2=19927&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/value.py (original)
+++ branches/relax_disp/pipe_control/value.py Thu Jun  6 23:31:42 2013
@@ -553,8 +553,7 @@
                 error_names = []
 
             # Sort the keys.
-            keys = value.keys()
-            keys.sort()
+            keys = sorted(value.keys())
 
             # Loop over the keys.
             for key in keys:

Modified: branches/relax_disp/specific_analyses/frame_order/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/frame_order/__init__.py?rev=19927&r1=19926&r2=19927&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/frame_order/__init__.py (original)
+++ branches/relax_disp/specific_analyses/frame_order/__init__.py Thu Jun  6 
23:31:42 2013
@@ -1060,7 +1060,7 @@
             else:
                 axes = zeros((3, 3), float64)
                 euler_to_R_zyz(cdp.eigen_alpha, cdp.eigen_beta, 
cdp.eigen_gamma, axes)
-                axis = axes[:,2]
+                axis = axes[:, 2]
 
             # Get the CoM of the entire molecule to use as the centre of the 
rotor.
             com = pipe_centre_of_mass(verbosity=0)