Author: bugman Date: Tue Jun 12 14:22:49 2012 New Revision: 16881 URL: http://svn.gna.org/viewcvs/relax?rev=16881&view=rev Log: Ported r16879 from trunk to allow relax 2.0.0 to run with Python version 2.6 and below. The command used was: svn merge -r16878:r16879 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk . ..... r16879 | bugman | 2012-06-12 11:34:42 +0200 (Tue, 12 Jun 2012) | 6 lines Changed paths: M /trunk/generic_fns/pipes.py M /trunk/gui/misc.py M /trunk/multi/processor.py M /trunk/prompt/uf_docstring.py Reverted the 2to3 changes of r16837 as these are deadly for Python 2.6! The command used was: svn merge -r16837:16836 . ..... Modified: tags/2.0.0/generic_fns/pipes.py tags/2.0.0/gui/misc.py tags/2.0.0/multi/processor.py tags/2.0.0/prompt/uf_docstring.py Modified: tags/2.0.0/generic_fns/pipes.py URL: http://svn.gna.org/viewcvs/relax/tags/2.0.0/generic_fns/pipes.py?rev=16881&r1=16880&r2=16881&view=diff ============================================================================== --- tags/2.0.0/generic_fns/pipes.py (original) +++ tags/2.0.0/generic_fns/pipes.py Tue Jun 12 14:22:49 2012 @@ -399,7 +399,8 @@ # Initialise. names = [] - pipes = sorted(ds.keys()) + pipes = ds.keys() + pipes.sort() # Loop over the pipes. for pipe in pipes: Modified: tags/2.0.0/gui/misc.py URL: http://svn.gna.org/viewcvs/relax/tags/2.0.0/gui/misc.py?rev=16881&r1=16880&r2=16881&view=diff ============================================================================== --- tags/2.0.0/gui/misc.py (original) +++ tags/2.0.0/gui/misc.py Tue Jun 12 14:22:49 2012 @@ -158,7 +158,7 @@ col_wrap = [True] * num_cols # Loop. - while True: + while 1: # The average column width. ave_width = free_space_wrap / num_cols_wrap Modified: tags/2.0.0/multi/processor.py URL: http://svn.gna.org/viewcvs/relax/tags/2.0.0/multi/processor.py?rev=16881&r1=16880&r2=16881&view=diff ============================================================================== --- tags/2.0.0/multi/processor.py (original) +++ tags/2.0.0/multi/processor.py Tue Jun 12 14:22:49 2012 @@ -569,7 +569,7 @@ self.assert_on_master() running_set = set() - idle_set = {i for i in range(1, self.processor_size()+1)} + idle_set = set([i for i in range(1, self.processor_size()+1)]) if self.threaded_result_processing: result_queue = Threaded_result_queue(self) Modified: tags/2.0.0/prompt/uf_docstring.py URL: http://svn.gna.org/viewcvs/relax/tags/2.0.0/prompt/uf_docstring.py?rev=16881&r1=16880&r2=16881&view=diff ============================================================================== --- tags/2.0.0/prompt/uf_docstring.py (original) +++ tags/2.0.0/prompt/uf_docstring.py Tue Jun 12 14:22:49 2012 @@ -142,7 +142,7 @@ col_wrap = [True] * num_cols # Loop. - while True: + while 1: # The average column width. ave_width = free_space_wrap / num_cols_wrap