Author: bugman Date: Tue Oct 16 22:27:43 2012 New Revision: 17875 URL: http://svn.gna.org/viewcvs/relax?rev=17875&view=rev Log: Merged revisions 17869 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r17869 | bugman | 2012-10-16 18:07:12 +0200 (Tue, 16 Oct 2012) | 3 lines Fixes for weird print statements with double brackets generated by the 2to3 Python conversion script. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/devel_scripts/test_python_versions.py branches/frame_order_testing/generic_fns/align_tensor.py branches/frame_order_testing/generic_fns/diffusion_tensor.py branches/frame_order_testing/generic_fns/minimise.py branches/frame_order_testing/generic_fns/model_selection.py branches/frame_order_testing/generic_fns/mol_res_spin.py branches/frame_order_testing/generic_fns/paramag.py branches/frame_order_testing/generic_fns/pcs.py branches/frame_order_testing/generic_fns/pipes.py branches/frame_order_testing/generic_fns/spectrum.py branches/frame_order_testing/generic_fns/structure/api_base.py branches/frame_order_testing/generic_fns/structure/geometric.py branches/frame_order_testing/generic_fns/structure/internal.py branches/frame_order_testing/generic_fns/structure/main.py branches/frame_order_testing/generic_fns/structure/mass.py branches/frame_order_testing/generic_fns/structure/scientific.py branches/frame_order_testing/generic_fns/structure/superimpose.py branches/frame_order_testing/opendx/isosurface_3D.py branches/frame_order_testing/prompt/help.py branches/frame_order_testing/prompt/tab_completion.py branches/frame_order_testing/relax.py branches/frame_order_testing/relax_io.py branches/frame_order_testing/sample_scripts/model_free/modsel.py branches/frame_order_testing/sample_scripts/model_free/palmer.py branches/frame_order_testing/scons/distrib.py branches/frame_order_testing/scons/install.py branches/frame_order_testing/scons/manuals.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/specific_fns/n_state_model.py branches/frame_order_testing/specific_fns/relax_fit.py branches/frame_order_testing/status.py branches/frame_order_testing/test_suite/shared_data/align_data/CaM/generate_data.py branches/frame_order_testing/test_suite/shared_data/align_data/CaM/pre_bleach.py branches/frame_order_testing/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py branches/frame_order_testing/test_suite/system_tests/diffusion_tensor.py branches/frame_order_testing/test_suite/system_tests/interatomic.py branches/frame_order_testing/test_suite/system_tests/model_free.py branches/frame_order_testing/test_suite/system_tests/palmer.py branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/absolute_rdcs.py branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/align_fit.py branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py branches/frame_order_testing/test_suite/system_tests/scripts/palmer.py branches/frame_order_testing/test_suite/system_tests/scripts/palmer_omp.py branches/frame_order_testing/test_suite/unit_tests/_data/test_diff_tensor.py branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_kronecker_product.py branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_rotation_matrix.py branches/frame_order_testing/test_suite/unit_tests/package_checking.py branches/frame_order_testing/test_suite/unit_tests/unit_test_runner.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/frame_order_testing/devel_scripts/test_python_versions.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/devel_scripts/test_python_versions.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/align_tensor.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/diffusion_tensor.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/minimise.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/minimise.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/model_selection.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/model_selection.py?rev=17875&r1=17874&r2=17875&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=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/paramag.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/paramag.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/pcs.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/pcs.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/pipes.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/pipes.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/spectrum.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/spectrum.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/structure/api_base.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/api_base.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/structure/geometric.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/geometric.py?rev=17875&r1=17874&r2=17875&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=17875&r1=17874&r2=17875&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=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/structure/mass.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/mass.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/structure/scientific.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/scientific.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/generic_fns/structure/superimpose.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/superimpose.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/opendx/isosurface_3D.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/opendx/isosurface_3D.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/prompt/help.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/prompt/help.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/prompt/tab_completion.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/prompt/tab_completion.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/relax.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/relax_io.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax_io.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/sample_scripts/model_free/modsel.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/model_free/modsel.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/sample_scripts/model_free/palmer.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/model_free/palmer.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/scons/distrib.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/scons/distrib.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/scons/install.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/scons/install.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/scons/manuals.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/scons/manuals.py?rev=17875&r1=17874&r2=17875&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=17875&r1=17874&r2=17875&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=17875&r1=17874&r2=17875&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=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/specific_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/n_state_model.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/specific_fns/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/relax_fit.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/status.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/status.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/align_data/CaM/generate_data.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/align_data/CaM/generate_data.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/align_data/CaM/pre_bleach.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/align_data/CaM/pre_bleach.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/diffusion_tensor.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/interatomic.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/interatomic.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/model_free.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/palmer.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/palmer.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/absolute_rdcs.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/absolute_rdcs.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/align_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/align_fit.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/scripts/palmer.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/palmer.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/scripts/palmer_omp.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/palmer_omp.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/unit_tests/_data/test_diff_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_data/test_diff_tensor.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_kronecker_product.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_kronecker_product.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_rotation_matrix.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_rotation_matrix.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/unit_tests/package_checking.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/package_checking.py?rev=17875&r1=17874&r2=17875&view=diff Modified: branches/frame_order_testing/test_suite/unit_tests/unit_test_runner.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/unit_test_runner.py?rev=17875&r1=17874&r2=17875&view=diff