Author: bugman Date: Mon Jun 11 10:15:21 2012 New Revision: 16837 URL: http://svn.gna.org/viewcvs/relax?rev=16837&view=rev Log: Python 3 updates for the entire relax code base. The command used was: 2to3 -w \ -f buffer \ -f idioms \ -f set_literal \ -f ws_comma \ -x except \ -x import \ -x imports \ -x long \ -x numliterals \ -x xrange \ relax . Modified: trunk/generic_fns/pipes.py trunk/gui/misc.py trunk/multi/processor.py trunk/prompt/uf_docstring.py Modified: trunk/generic_fns/pipes.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pipes.py?rev=16837&r1=16836&r2=16837&view=diff ============================================================================== --- trunk/generic_fns/pipes.py (original) +++ trunk/generic_fns/pipes.py Mon Jun 11 10:15:21 2012 @@ -399,8 +399,7 @@ # Initialise. names = [] - pipes = ds.keys() - pipes.sort() + pipes = sorted(ds.keys()) # Loop over the pipes. for pipe in pipes: Modified: trunk/gui/misc.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/misc.py?rev=16837&r1=16836&r2=16837&view=diff ============================================================================== --- trunk/gui/misc.py (original) +++ trunk/gui/misc.py Mon Jun 11 10:15:21 2012 @@ -158,7 +158,7 @@ col_wrap = [True] * num_cols # Loop. - while 1: + while True: # The average column width. ave_width = free_space_wrap / num_cols_wrap Modified: trunk/multi/processor.py URL: http://svn.gna.org/viewcvs/relax/trunk/multi/processor.py?rev=16837&r1=16836&r2=16837&view=diff ============================================================================== --- trunk/multi/processor.py (original) +++ trunk/multi/processor.py Mon Jun 11 10:15:21 2012 @@ -569,7 +569,7 @@ self.assert_on_master() running_set = set() - idle_set = set([i for i in range(1, self.processor_size()+1)]) + idle_set = {i for i in range(1, self.processor_size()+1)} if self.threaded_result_processing: result_queue = Threaded_result_queue(self) Modified: trunk/prompt/uf_docstring.py URL: http://svn.gna.org/viewcvs/relax/trunk/prompt/uf_docstring.py?rev=16837&r1=16836&r2=16837&view=diff ============================================================================== --- trunk/prompt/uf_docstring.py (original) +++ trunk/prompt/uf_docstring.py Mon Jun 11 10:15:21 2012 @@ -142,7 +142,7 @@ col_wrap = [True] * num_cols # Loop. - while 1: + while True: # The average column width. ave_width = free_space_wrap / num_cols_wrap