r17835 - in /branches/frame_order_testing: ./ auto_analyses/ data/ docs/latex/ generic_fns/ generic_fns/structure/ gui/ gui/...r17835 - in /branches/frame_order_testing: ./ auto_analyses/ data/ docs/latex/ generic_fns/ generic_fns/structure/ gui/ gui/...Author: bugman Date: Tue Oct 16 10:40:17 2012 New Revision: 17835 URL: http://svn.gna.org/viewcvs/relax?rev=17835&view=rev Log: Merged revisions 17623 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r17623 | bugman | 2012-10-01 18:48:11 +0200 (Mon, 01 Oct 2012) | 5 lines Python 3 preparations - removed all of the string module functions which no longer exist in Python 3. These functions are part of the strings themselves now. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/auto_analyses/dauvergne_protocol.py branches/frame_order_testing/data/mol_res_spin.py branches/frame_order_testing/docs/latex/fetch_docstrings.py branches/frame_order_testing/generic_fns/dasha.py branches/frame_order_testing/generic_fns/mol_res_spin.py branches/frame_order_testing/generic_fns/palmer.py branches/frame_order_testing/generic_fns/relax_re.py branches/frame_order_testing/generic_fns/structure/internal.py branches/frame_order_testing/generic_fns/structure/main.py branches/frame_order_testing/gui/analyses/auto_rx_base.py branches/frame_order_testing/gui/input_elements/sequence.py branches/frame_order_testing/gui/input_elements/sequence_2D.py branches/frame_order_testing/gui/interpreter.py branches/frame_order_testing/gui/menu.py branches/frame_order_testing/gui/results_viewer.py branches/frame_order_testing/gui/spin_viewer/containers.py branches/frame_order_testing/physical_constants.py branches/frame_order_testing/sample_scripts/model_free/final_data_extraction.py branches/frame_order_testing/sample_scripts/model_free/table_csv.py branches/frame_order_testing/sample_scripts/model_free/table_latex.py branches/frame_order_testing/setup.py branches/frame_order_testing/specific_fns/frame_order.py branches/frame_order_testing/specific_fns/model_free/main.py branches/frame_order_testing/specific_fns/model_free/results.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py branches/frame_order_testing/test_suite/system_tests/scripts/model_free/full_analysis_trunc.py branches/frame_order_testing/test_suite/system_tests/scripts/model_free/latex_mf_table.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/frame_order_testing/auto_analyses/dauvergne_protocol.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/auto_analyses/dauvergne_protocol.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/data/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/mol_res_spin.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/docs/latex/fetch_docstrings.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/docs/latex/fetch_docstrings.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/generic_fns/dasha.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/dasha.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/generic_fns/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/mol_res_spin.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/generic_fns/palmer.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/palmer.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/generic_fns/relax_re.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/relax_re.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/generic_fns/structure/internal.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/internal.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/generic_fns/structure/main.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/main.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/gui/analyses/auto_rx_base.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/analyses/auto_rx_base.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/gui/input_elements/sequence.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/input_elements/sequence.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/gui/input_elements/sequence_2D.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/input_elements/sequence_2D.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/gui/interpreter.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/interpreter.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/gui/menu.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/menu.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/gui/results_viewer.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/results_viewer.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/gui/spin_viewer/containers.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/spin_viewer/containers.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/physical_constants.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/physical_constants.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/sample_scripts/model_free/final_data_extraction.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/model_free/final_data_extraction.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/sample_scripts/model_free/table_csv.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/model_free/table_csv.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/sample_scripts/model_free/table_latex.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/model_free/table_latex.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/setup.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/setup.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/frame_order.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/specific_fns/model_free/main.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/main.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/specific_fns/model_free/results.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/results.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/scripts/model_free/full_analysis_trunc.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/model_free/full_analysis_trunc.py?rev=17835&r1=17834&r2=17835&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/scripts/model_free/latex_mf_table.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/model_free/latex_mf_table.py?rev=17835&r1=17834&r2=17835&view=diff