r16879 - in /trunk: generic_fns/pipes.py gui/misc.py multi/processor.py prompt/uf_docstring.py -- June 12, 2012 - 11:34

Author: bugman
Date: Tue Jun 12 11:34:42 2012
New Revision: 16879

URL: http://svn.gna.org/viewcvs/relax?rev=16879&view=rev
Log:
Reverted the 2to3 changes of r16837 as these are deadly for Python 2.6!

The command used was:
svn merge -r16837:16836 .


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=16879&r1=16878&r2=16879&view=diff
==============================================================================
--- trunk/generic_fns/pipes.py (original)
+++ trunk/generic_fns/pipes.py Tue Jun 12 11:34:42 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: trunk/gui/misc.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/misc.py?rev=16879&r1=16878&r2=16879&view=diff
==============================================================================
--- trunk/gui/misc.py (original)
+++ trunk/gui/misc.py Tue Jun 12 11:34:42 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: trunk/multi/processor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/multi/processor.py?rev=16879&r1=16878&r2=16879&view=diff
==============================================================================
--- trunk/multi/processor.py (original)
+++ trunk/multi/processor.py Tue Jun 12 11:34:42 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: trunk/prompt/uf_docstring.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/prompt/uf_docstring.py?rev=16879&r1=16878&r2=16879&view=diff
==============================================================================
--- trunk/prompt/uf_docstring.py (original)
+++ trunk/prompt/uf_docstring.py Tue Jun 12 11:34:42 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