r26533 - in /branches/frame_order_cleanup: ./ lib/sequence.py specific_analyses/relax_disp/model.py -- November 11, 2014 - 16:38

Author: bugman
Date: Tue Nov 11 16:38:42 2014
New Revision: 26533

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

........
  r26531 | bugman | 2014-11-11 16:37:13 +0100 (Tue, 11 Nov 2014) | 6 lines
  
  Python 3 fixes via 2to3 - the filter() function in Python 3 now returns an 
iterator.
  
  The command used was:
  2to3 -j 4 -w -f filter .
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/lib/sequence.py
    branches/frame_order_cleanup/specific_analyses/relax_disp/model.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 11 16:38:42 2014
@@ -1 +1 @@
-/trunk:1-26528
+/trunk:1-26531

Modified: branches/frame_order_cleanup/lib/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/sequence.py?rev=26533&r1=26532&r2=26533&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/sequence.py        (original)
+++ branches/frame_order_cleanup/lib/sequence.py        Tue Nov 11 16:38:42 
2014
@@ -84,7 +84,7 @@
         raise RelaxError("If the 'spin_id_col' argument has been supplied, 
then the mol_name_col, res_name_col, res_num_col, spin_name_col, and 
spin_num_col must all be set to None.")
 
     # Minimum number of columns.
-    min_col_num = max(filter(None, [spin_id_col, mol_name_col, res_num_col, 
res_name_col, spin_num_col, spin_name_col, data_col, error_col]))
+    min_col_num = max([_f for _f in [spin_id_col, mol_name_col, res_num_col, 
res_name_col, spin_num_col, spin_name_col, data_col, error_col] if _f])
 
     # Extract the data from the file.
     if not file_data:

Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/model.py?rev=26533&r1=26532&r2=26533&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/relax_disp/model.py  
(original)
+++ branches/frame_order_cleanup/specific_analyses/relax_disp/model.py  Tue 
Nov 11 16:38:42 2014
@@ -78,7 +78,7 @@
         if nest_list == None:
             self.nest_list = nest_list
         else:
-            nest_list = filter(partial(ne, self.model), nest_list)
+            nest_list = list(filter(partial(ne, self.model), nest_list))
             self.nest_list = nest_list
 
         # Define the order of how exp type ranks.