Author: bugman Date: Tue May 22 14:26:56 2012 New Revision: 16388 URL: http://svn.gna.org/viewcvs/relax?rev=16388&view=rev Log: The execute_uf() method is now private! Modified: branches/uf_redesign/test_suite/gui_tests/model_free.py branches/uf_redesign/test_suite/gui_tests/noe.py branches/uf_redesign/test_suite/gui_tests/rx.py Modified: branches/uf_redesign/test_suite/gui_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/model_free.py?rev=16388&r1=16387&r2=16388&view=diff ============================================================================== --- branches/uf_redesign/test_suite/gui_tests/model_free.py (original) +++ branches/uf_redesign/test_suite/gui_tests/model_free.py Tue May 22 14:26:56 2012 @@ -72,7 +72,7 @@ data_path = status.install_path + sep + 'test_suite' + sep + 'shared_data' + sep + 'model_free' + sep + 'sphere' + sep # Load the sequence. - self.execute_uf(uf_name='sequence.read', file=data_path+'noe.500.out') + self._execute_uf(uf_name='sequence.read', file=data_path+'noe.500.out') # Load the relaxation data. data = [ @@ -84,13 +84,13 @@ ['r2.900.out', 'r2_900', 'R2', 900e6] ] for i in range(len(data)): - self.execute_uf(uf_name='relax_data.read', file=data_path+data[i][0], ri_id=data[i][1], ri_type=data[i][2], frq=data[i][3]) + self._execute_uf(uf_name='relax_data.read', file=data_path+data[i][0], ri_id=data[i][1], ri_type=data[i][2], frq=data[i][3]) # Set the values. - self.execute_uf(uf_name='value.set', param='csa') - self.execute_uf(uf_name='value.set', param='r') - self.execute_uf(uf_name='value.set', param='heteronuc_type') - self.execute_uf(uf_name='value.set', param='proton_type') + self._execute_uf(uf_name='value.set', param='csa') + self._execute_uf(uf_name='value.set', param='r') + self._execute_uf(uf_name='value.set', param='heteronuc_type') + self._execute_uf(uf_name='value.set', param='proton_type') # The unit vector loading wizard. analysis.load_unit_vectors(None) Modified: branches/uf_redesign/test_suite/gui_tests/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/noe.py?rev=16388&r1=16387&r2=16388&view=diff ============================================================================== --- branches/uf_redesign/test_suite/gui_tests/noe.py (original) +++ branches/uf_redesign/test_suite/gui_tests/noe.py Tue May 22 14:26:56 2012 @@ -73,13 +73,13 @@ # Load the sequence. file = status.install_path + sep + 'test_suite' + sep + 'shared_data' + sep + 'Ap4Aase.seq' - self.execute_uf(uf_name='sequence.read', file=file, mol_name_col=None, res_name_col=2, res_num_col=1, spin_name_col=None, spin_num_col=None) + self._execute_uf(uf_name='sequence.read', file=file, mol_name_col=None, res_name_col=2, res_num_col=1, spin_name_col=None, spin_num_col=None) # Unresolved spins. - self.execute_uf(uf_name='deselect.spin', spin_id=":3") + self._execute_uf(uf_name='deselect.spin', spin_id=":3") # Name the spins. - self.execute_uf(uf_name='spin.name', name="N") + self._execute_uf(uf_name='spin.name', name="N") # Flush the interpreter in preparation for the synchronous user functions of the peak list wizard. interpreter.flush() Modified: branches/uf_redesign/test_suite/gui_tests/rx.py URL: http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/rx.py?rev=16388&r1=16387&r2=16388&view=diff ============================================================================== --- branches/uf_redesign/test_suite/gui_tests/rx.py (original) +++ branches/uf_redesign/test_suite/gui_tests/rx.py Tue May 22 14:26:56 2012 @@ -112,13 +112,13 @@ # Load the sequence. file = status.install_path + sep + 'test_suite' + sep + 'shared_data' + sep + 'Ap4Aase.seq' - self.execute_uf(uf_name='sequence.read', file=file, mol_name_col=None, res_name_col=2, res_num_col=1, spin_name_col=None, spin_num_col=None) + self._execute_uf(uf_name='sequence.read', file=file, mol_name_col=None, res_name_col=2, res_num_col=1, spin_name_col=None, spin_num_col=None) # Unresolved spins. - self.execute_uf(uf_name='deselect.read', file=data_path+'unresolved', mol_name_col=None, res_name_col=None, res_num_col=1, spin_name_col=None, spin_num_col=None, change_all=True) + self._execute_uf(uf_name='deselect.read', file=data_path+'unresolved', mol_name_col=None, res_name_col=None, res_num_col=1, spin_name_col=None, spin_num_col=None, change_all=True) # Name the spins. - self.execute_uf(uf_name='spin.name', name='N') + self._execute_uf(uf_name='spin.name', name='N') # Flush the interpreter in preparation for the synchronous user functions of the peak list wizard. interpreter.flush()