r26519 - in /trunk: ./ data_store/ extern/sobol/ gui/ gui/analyses/ gui/components/ gui/spin_viewer/ lib/ lib/structure/inte...r26519 - in /trunk: ./ data_store/ extern/sobol/ gui/ gui/analyses/ gui/components/ gui/spin_viewer/ lib/ lib/structure/inte...Author: bugman Date: Tue Nov 11 14:26:23 2014 New Revision: 26519 URL: http://svn.gna.org/viewcvs/relax?rev=26519&view=rev Log: Manual Python 3 fixes for the dict.key() function which returns a list or iterator in Python 2 or 3. This involves a number of changes. The biggest is the conversion of the "x in y.keys()" statements to "x in y". For code which requires a list of keys, the function calls "list(y.keys())" or preferably "sorted(y.keys())" are used throughout (sorted() ensures that the list will be of the same order on all operating systems and Python implementations). A number of "x in list(y.keys())" statements were simplified to "x in y", some list() calls changed to sorted(), and some unnecessary list() calls were removed. Modified: trunk/data_store/__init__.py trunk/data_store/align_tensor.py trunk/data_store/data_classes.py trunk/data_store/diff_tensor.py trunk/data_store/pipe_container.py trunk/data_store/prototype.py trunk/extern/sobol/sobol_lib.py trunk/gui/analyses/__init__.py trunk/gui/components/relax_data.py trunk/gui/components/relax_data_meta.py trunk/gui/components/spectrum.py trunk/gui/export_bmrb.py trunk/gui/spin_viewer/tree.py trunk/gui/uf_objects.py trunk/lib/structure/internal/molecules.py trunk/lib/xml.py trunk/pipe_control/align_tensor.py trunk/pipe_control/bmrb.py trunk/pipe_control/error_analysis.py trunk/pipe_control/interatomic.py trunk/pipe_control/pcs.py trunk/pipe_control/pipes.py trunk/pipe_control/plotting.py trunk/pipe_control/rdc.py trunk/pipe_control/relax_data.py trunk/pipe_control/sequence.py trunk/pipe_control/spectrometer.py trunk/pipe_control/spectrum.py trunk/pipe_control/state.py trunk/prompt/interpreter.py trunk/prompt/tab_completion.py trunk/prompt/uf_objects.py trunk/specific_analyses/frame_order/data.py trunk/specific_analyses/frame_order/optimisation.py trunk/specific_analyses/frame_order/uf.py trunk/specific_analyses/model_free/api.py trunk/specific_analyses/model_free/bmrb.py trunk/specific_analyses/model_free/data.py trunk/specific_analyses/parameter_object.py trunk/specific_analyses/relax_disp/api.py trunk/specific_analyses/relax_disp/checks.py trunk/specific_analyses/relax_disp/data.py trunk/specific_analyses/relax_disp/parameters.py trunk/specific_analyses/relax_disp/uf.py trunk/specific_analyses/relax_fit/api.py trunk/specific_analyses/relax_fit/parameter_object.py trunk/status.py trunk/test_suite/gui_tests/rx.py trunk/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/correlation.py trunk/test_suite/system_tests/bmrb.py trunk/test_suite/system_tests/dasha.py trunk/test_suite/system_tests/model_free.py trunk/test_suite/system_tests/n_state_model.py trunk/test_suite/system_tests/relax_disp.py trunk/test_suite/system_tests/scripts/n_state_model/phthalic_acid_noes.py trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_data.py trunk/test_suite/unit_tests/state_testing_base.py trunk/user_functions/data.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/data_store/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/__init__.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/data_store/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/align_tensor.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/data_store/data_classes.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/data_classes.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/data_store/diff_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/diff_tensor.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/data_store/pipe_container.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/pipe_container.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/data_store/prototype.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/prototype.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/extern/sobol/sobol_lib.py URL: http://svn.gna.org/viewcvs/relax/trunk/extern/sobol/sobol_lib.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/gui/analyses/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/__init__.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/gui/components/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/components/relax_data.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/gui/components/relax_data_meta.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/components/relax_data_meta.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/gui/components/spectrum.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/components/spectrum.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/gui/export_bmrb.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/export_bmrb.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/gui/spin_viewer/tree.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/spin_viewer/tree.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/gui/uf_objects.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/uf_objects.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/lib/structure/internal/molecules.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/structure/internal/molecules.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/lib/xml.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/xml.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/align_tensor.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/bmrb.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/bmrb.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/error_analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/error_analysis.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/interatomic.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/interatomic.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/pcs.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/pcs.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/pipes.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/pipes.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/plotting.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/plotting.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/rdc.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/rdc.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/relax_data.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/sequence.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/sequence.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/spectrometer.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/spectrometer.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/spectrum.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/spectrum.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/pipe_control/state.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/state.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/trunk/prompt/interpreter.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/prompt/tab_completion.py URL: http://svn.gna.org/viewcvs/relax/trunk/prompt/tab_completion.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/prompt/uf_objects.py URL: http://svn.gna.org/viewcvs/relax/trunk/prompt/uf_objects.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/frame_order/data.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/data.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/frame_order/optimisation.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/optimisation.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/frame_order/uf.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/uf.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/model_free/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/api.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/model_free/bmrb.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/bmrb.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/model_free/data.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/data.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/parameter_object.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/parameter_object.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/relax_disp/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/api.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/relax_disp/checks.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/checks.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/relax_disp/data.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/data.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/relax_disp/parameters.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/parameters.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/relax_disp/uf.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/uf.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/relax_fit/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_fit/api.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/specific_analyses/relax_fit/parameter_object.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_fit/parameter_object.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/status.py URL: http://svn.gna.org/viewcvs/relax/trunk/status.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/gui_tests/rx.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/rx.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/correlation.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/correlation.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/system_tests/bmrb.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/bmrb.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/system_tests/dasha.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/dasha.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/system_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/model_free.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/system_tests/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/n_state_model.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/system_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/system_tests/scripts/n_state_model/phthalic_acid_noes.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/phthalic_acid_noes.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_data.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/test_suite/unit_tests/state_testing_base.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/state_testing_base.py?rev=26519&r1=26518&r2=26519&view=diff Modified: trunk/user_functions/data.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/data.py?rev=26519&r1=26518&r2=26519&view=diff