r16882 - in /branches/interatomic: ./ generic_fns/ gui/ multi/ prompt/ test_suite/gui_tests/ -- June 12, 2012 - 17:37

Author: bugman
Date: Tue Jun 12 17:37:31 2012
New Revision: 16882

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

........
  r16866 | bugman | 2012-06-11 21:05:16 +0200 (Mon, 11 Jun 2012) | 6 lines
  
  Bug fix for a segmentation fault occurring during the model-free GUI test.
  
  Flushing of the interpreter queue object is needed as some parts of the 
interface use asynchronous
  user function calls.
........
  r16879 | bugman | 2012-06-12 11:34:42 +0200 (Tue, 12 Jun 2012) | 6 lines
  
  Reverted the 2to3 changes of r16837 as these are deadly for Python 2.6!
  
  The command used was:
  svn merge -r16837:16836 .
........

Modified:
    branches/interatomic/   (props changed)
    branches/interatomic/generic_fns/pipes.py
    branches/interatomic/gui/misc.py
    branches/interatomic/multi/processor.py
    branches/interatomic/prompt/uf_docstring.py
    branches/interatomic/test_suite/gui_tests/model_free.py

Propchange: branches/interatomic/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 12 17:37:31 2012
@@ -1,1 +1,1 @@
-/trunk:1-16849
+/trunk:1-16881

Modified: branches/interatomic/generic_fns/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/pipes.py?rev=16882&r1=16881&r2=16882&view=diff
==============================================================================
--- branches/interatomic/generic_fns/pipes.py (original)
+++ branches/interatomic/generic_fns/pipes.py Tue Jun 12 17:37:31 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: branches/interatomic/gui/misc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/gui/misc.py?rev=16882&r1=16881&r2=16882&view=diff
==============================================================================
--- branches/interatomic/gui/misc.py (original)
+++ branches/interatomic/gui/misc.py Tue Jun 12 17:37:31 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: branches/interatomic/multi/processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/multi/processor.py?rev=16882&r1=16881&r2=16882&view=diff
==============================================================================
--- branches/interatomic/multi/processor.py (original)
+++ branches/interatomic/multi/processor.py Tue Jun 12 17:37:31 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: branches/interatomic/prompt/uf_docstring.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/prompt/uf_docstring.py?rev=16882&r1=16881&r2=16882&view=diff
==============================================================================
--- branches/interatomic/prompt/uf_docstring.py (original)
+++ branches/interatomic/prompt/uf_docstring.py Tue Jun 12 17:37:31 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
 

Modified: branches/interatomic/test_suite/gui_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/test_suite/gui_tests/model_free.py?rev=16882&r1=16881&r2=16882&view=diff
==============================================================================
--- branches/interatomic/test_suite/gui_tests/model_free.py (original)
+++ branches/interatomic/test_suite/gui_tests/model_free.py Tue Jun 12 
17:37:31 2012
@@ -106,12 +106,16 @@
         # Set the values, using the methods behind the buttons to set up the 
user functions with default values, and then manually executing the user 
function.
         analysis.value_set_csa()
         uf_store['value.set'].wizard._ok()
+        interpreter.flush()    # Required because of the asynchronous uf 
call.
         analysis.value_set_r()
         uf_store['value.set'].wizard._ok()
+        interpreter.flush()    # Required because of the asynchronous uf 
call.
         analysis.value_set_heteronuc_type()
         uf_store['value.set'].wizard._ok()
+        interpreter.flush()    # Required because of the asynchronous uf 
call.
         analysis.value_set_proton_type()
         uf_store['value.set'].wizard._ok()
+        interpreter.flush()    # Required because of the asynchronous uf 
call.
 
         # The unit vector loading wizard.
         analysis.load_unit_vectors()
@@ -120,9 +124,11 @@
         page = analysis.vect_wizard.get_page(0)
         page.uf_args['file'].SetValue(str_to_gui(status.install_path + sep + 
'test_suite' + sep + 'shared_data' + sep + 'model_free' + sep + 'sphere' + 
sep + 'sphere.pdb'))
         analysis.vect_wizard._go_next()
+        interpreter.flush()    # Required because of the asynchronous uf 
call.
 
         # The unit vectors.
         analysis.vect_wizard._go_next()
+        interpreter.flush()    # Required because of the asynchronous uf 
call.
 
         # Select only the tm0 and tm1 local tm models.
         analysis.local_tm_model_field.select = [True, True, False, False, 
False, False, False, False, False, False]