Author: bugman Date: Fri Aug 21 12:07:01 2009 New Revision: 9350 URL: http://svn.gna.org/viewcvs/relax?rev=9350&view=rev Log: The Python 2.x idioms have been removed. This was done with the python 2.x to 3.x script with the commands: 2to3 -w -f exec relax . The change is in preparation for Python 3.0, and relax still works with Python versions 2.4, 2.5, and 2.6. The changes include: 1) The call to type() has been replaced with isinstance(). 2) "while 1" has been replaced with "while True". 3) list sort methods x.sort() have been replaced with a call to sorted(x). Booleans are instances of int, so the user function argument unit tests will be a massive mess! Modified: 1.3/colour.py 1.3/data/__init__.py 1.3/data/diff_tensor.py 1.3/data/mol_res_spin.py 1.3/data/relax_xml.py 1.3/docs/2to3_checklist 1.3/docs/latex/fetch_docstrings.py 1.3/float.py 1.3/generic_fns/align_tensor.py 1.3/generic_fns/angles.py 1.3/generic_fns/diffusion_tensor.py 1.3/generic_fns/grace.py 1.3/generic_fns/model_selection.py 1.3/generic_fns/mol_res_spin.py 1.3/generic_fns/monte_carlo.py 1.3/generic_fns/noesy.py 1.3/generic_fns/palmer.py 1.3/generic_fns/pcs.py 1.3/generic_fns/rdc.py 1.3/generic_fns/relax_data.py 1.3/generic_fns/relax_re.py 1.3/generic_fns/spectrum.py 1.3/generic_fns/structure/internal.py 1.3/generic_fns/structure/scientific.py 1.3/generic_fns/value.py 1.3/generic_fns/xplor.py 1.3/prompt/align_tensor.py 1.3/prompt/command.py 1.3/prompt/consistency_tests.py 1.3/prompt/dasha.py 1.3/prompt/deselect.py 1.3/prompt/diffusion_tensor.py 1.3/prompt/dx.py 1.3/prompt/eliminate.py 1.3/prompt/fix.py 1.3/prompt/frame_order.py 1.3/prompt/frq.py 1.3/prompt/grace.py 1.3/prompt/help.py 1.3/prompt/interpreter.py 1.3/prompt/jw_mapping.py 1.3/prompt/minimisation.py 1.3/prompt/model_free.py 1.3/prompt/model_selection.py 1.3/prompt/molecule.py 1.3/prompt/molmol.py 1.3/prompt/monte_carlo.py 1.3/prompt/n_state_model.py 1.3/prompt/noe.py 1.3/prompt/palmer.py 1.3/prompt/pcs.py 1.3/prompt/pipe.py 1.3/prompt/pymol.py 1.3/prompt/rdc.py 1.3/prompt/relax_data.py 1.3/prompt/relax_fit.py 1.3/prompt/residue.py 1.3/prompt/results.py 1.3/prompt/select.py 1.3/prompt/sequence.py 1.3/prompt/spectrum.py 1.3/prompt/spin.py 1.3/prompt/state.py 1.3/prompt/structure.py 1.3/prompt/temperature.py 1.3/prompt/value.py 1.3/relax_io.py 1.3/sample_scripts/full_analysis.py 1.3/specific_fns/base_class.py 1.3/specific_fns/consistency_tests.py 1.3/specific_fns/frame_order.py 1.3/specific_fns/jw_mapping.py 1.3/specific_fns/model_free/mf_minimise.py 1.3/specific_fns/n_state_model.py 1.3/specific_fns/relax_fit.py 1.3/test_suite/system_tests/model_free.py 1.3/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py 1.3/test_suite/unit_tests/_maths_fns/test_kronecker_product.py 1.3/test_suite/unit_tests/_prompt/test_minimisation.py 1.3/test_suite/unit_tests/_prompt/test_n_state_model.py 1.3/test_suite/unit_tests/_prompt/test_sequence.py 1.3/test_suite/unit_tests/_prompt/test_spectrum.py 1.3/test_suite/unit_tests/_prompt/test_value.py 1.3/test_suite/unit_tests/unit_test_runner.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: 1.3/colour.py URL: http://svn.gna.org/viewcvs/relax/1.3/colour.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/data/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/__init__.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/data/diff_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/diff_tensor.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/data/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/mol_res_spin.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/data/relax_xml.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/relax_xml.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/docs/2to3_checklist URL: http://svn.gna.org/viewcvs/relax/1.3/docs/2to3_checklist?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/docs/latex/fetch_docstrings.py URL: http://svn.gna.org/viewcvs/relax/1.3/docs/latex/fetch_docstrings.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/float.py URL: http://svn.gna.org/viewcvs/relax/1.3/float.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/align_tensor.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/angles.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/angles.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/diffusion_tensor.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/grace.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/grace.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/model_selection.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/model_selection.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/mol_res_spin.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/monte_carlo.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/monte_carlo.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/noesy.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/noesy.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/palmer.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/pcs.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pcs.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/rdc.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/rdc.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/relax_data.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/relax_re.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/relax_re.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/spectrum.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/spectrum.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/structure/internal.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/internal.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/structure/scientific.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/scientific.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/value.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/value.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/generic_fns/xplor.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/xplor.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/align_tensor.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/command.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/command.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/consistency_tests.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/dasha.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/dasha.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/deselect.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/deselect.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/diffusion_tensor.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/dx.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/dx.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/eliminate.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/eliminate.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/fix.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/fix.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/frame_order.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/frame_order.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/frq.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/frq.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/grace.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/grace.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/help.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/help.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/jw_mapping.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/minimisation.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/minimisation.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/model_free.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/model_selection.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/model_selection.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/molecule.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/molecule.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/molmol.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/monte_carlo.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/monte_carlo.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/n_state_model.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/noe.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/noe.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/palmer.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/pcs.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/pcs.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/pipe.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/pipe.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/pymol.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/pymol.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/rdc.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/rdc.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_data.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_fit.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/residue.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/residue.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/results.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/results.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/select.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/select.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/sequence.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/sequence.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/spectrum.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/spectrum.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/spin.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/spin.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/state.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/state.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/structure.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/structure.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/temperature.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/temperature.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/prompt/value.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/value.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/relax_io.py URL: http://svn.gna.org/viewcvs/relax/1.3/relax_io.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/sample_scripts/full_analysis.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/full_analysis.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/specific_fns/base_class.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/base_class.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/specific_fns/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/consistency_tests.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/frame_order.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/specific_fns/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/specific_fns/model_free/mf_minimise.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/specific_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/n_state_model.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/specific_fns/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/test_suite/system_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/test_suite/unit_tests/_maths_fns/test_kronecker_product.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_maths_fns/test_kronecker_product.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/test_suite/unit_tests/_prompt/test_minimisation.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_minimisation.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/test_suite/unit_tests/_prompt/test_n_state_model.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_n_state_model.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/test_suite/unit_tests/_prompt/test_sequence.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_sequence.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/test_suite/unit_tests/_prompt/test_spectrum.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_spectrum.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/test_suite/unit_tests/_prompt/test_value.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_value.py?rev=9350&r1=9349&r2=9350&view=diff Modified: 1.3/test_suite/unit_tests/unit_test_runner.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/unit_test_runner.py?rev=9350&r1=9349&r2=9350&view=diff