r17840 - in /branches/frame_order_testing: ./ auto_analyses/ generic_fns/ generic_fns/structure/ graphics/wizards/dipole_pai...r17840 - in /branches/frame_order_testing: ./ auto_analyses/ generic_fns/ generic_fns/structure/ graphics/wizards/dipole_pai...Author: bugman Date: Tue Oct 16 10:56:13 2012 New Revision: 17840 URL: http://svn.gna.org/viewcvs/relax?rev=17840&view=rev Log: Merged revisions 17671-17675 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r17671 | bugman | 2012-10-02 15:48:31 +0200 (Tue, 02 Oct 2012) | 5 lines Python 3 fix for the user function docstring creation in the prompt UI mode. Again this is the problem of a division now returning a float rather than an int. ........ r17672 | bugman | 2012-10-02 16:05:11 +0200 (Tue, 02 Oct 2012) | 5 lines Python 3 fix for the test_write_protein_sequence() unit test. This is again a string verses byte verses unicode problem. ........ r17673 | bugman | 2012-10-02 16:09:58 +0200 (Tue, 02 Oct 2012) | 5 lines Python 3 bug fix for the Structure.test_read_pdb_mol_2_model_scientific system tests. This is again an integer division problem returning a float. ........ r17674 | bugman | 2012-10-02 16:12:01 +0200 (Tue, 02 Oct 2012) | 5 lines Python 2 and 3 support in the generic_fns.relax_data module using 2to3. One print call was fixed after running 2to3. ........ r17675 | bugman | 2012-10-02 16:24:58 +0200 (Tue, 02 Oct 2012) | 3 lines Python 3 fixes - eliminated all usage of the dictionary has_key() calls as they are no longer present. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/auto_analyses/dauvergne_protocol.py branches/frame_order_testing/generic_fns/pcs.py branches/frame_order_testing/generic_fns/rdc.py branches/frame_order_testing/generic_fns/relax_data.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/internal.py branches/frame_order_testing/graphics/wizards/dipole_pair/VectorFieldPlot.py branches/frame_order_testing/gui/controller.py branches/frame_order_testing/info.py branches/frame_order_testing/prompt/uf_docstring.py branches/frame_order_testing/specific_fns/consistency_tests.py branches/frame_order_testing/specific_fns/jw_mapping.py branches/frame_order_testing/specific_fns/model_free/main.py branches/frame_order_testing/specific_fns/n_state_model.py branches/frame_order_testing/test_suite/system_tests/n_state_model.py branches/frame_order_testing/test_suite/system_tests/relax_data.py branches/frame_order_testing/test_suite/system_tests/structure.py branches/frame_order_testing/test_suite/unit_tests/sequence_testing_base.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=17840&r1=17839&r2=17840&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=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/generic_fns/rdc.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/rdc.py?rev=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/generic_fns/relax_data.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/relax_data.py?rev=17840&r1=17839&r2=17840&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=17840&r1=17839&r2=17840&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=17840&r1=17839&r2=17840&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=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/graphics/wizards/dipole_pair/VectorFieldPlot.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/graphics/wizards/dipole_pair/VectorFieldPlot.py?rev=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/gui/controller.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/controller.py?rev=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/info.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/info.py?rev=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/prompt/uf_docstring.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/prompt/uf_docstring.py?rev=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/specific_fns/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/consistency_tests.py?rev=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/specific_fns/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/jw_mapping.py?rev=17840&r1=17839&r2=17840&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=17840&r1=17839&r2=17840&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=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/n_state_model.py?rev=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/relax_data.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/relax_data.py?rev=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/structure.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/structure.py?rev=17840&r1=17839&r2=17840&view=diff Modified: branches/frame_order_testing/test_suite/unit_tests/sequence_testing_base.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/sequence_testing_base.py?rev=17840&r1=17839&r2=17840&view=diff