Author: bugman
Date: Tue Oct 16 11:00:04 2012
New Revision: 17842
URL: http://svn.gna.org/viewcvs/relax?rev=17842&view=rev
Log:
Merged revisions 17677-17687 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r17677 | bugman | 2012-10-02 16:35:26 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 integer division to float fix for the frame order analysis.
........
r17678 | bugman | 2012-10-02 16:54:57 +0200 (Tue, 02 Oct 2012) | 5 lines
Python 3 fix for the frame order system tests - float to string conversions
behave differently.
Now the explicit %.1f formatting is used to force only a single decimal
place float.
........
r17679 | bugman | 2012-10-02 16:58:40 +0200 (Tue, 02 Oct 2012) | 6 lines
Python 3 fix for the frame order system tests matching r17678.
As float to string conversions behave differently, the %.1f formatting is
used to force only a
single decimal place float.
........
r17680 | bugman | 2012-10-02 16:59:22 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 fix - removed the use of the string.lower() function in the OpenDX
mapping code.
........
r17681 | bugman | 2012-10-02 17:47:23 +0200 (Tue, 02 Oct 2012) | 6 lines
Python 3 fix for the writing out of XML formatted state and results files.
In Python 3, the xmldoc.toprettyxml() returns a string object which needs
to be 'encoded' prior to
writing out to file.
........
r17682 | bugman | 2012-10-02 17:58:04 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 import fixes for the generic_fns.structure package using relative
paths.
........
r17683 | bugman | 2012-10-02 18:29:25 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 fix for the format detection of results and save files.
........
r17684 | bugman | 2012-10-02 18:34:02 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 2 fix for the relax_io.extract_data() function for a bug introduced
at r17669.
........
r17685 | bugman | 2012-10-02 18:46:16 +0200 (Tue, 02 Oct 2012) | 5 lines
The relax_io.DummyFileObject now mimics a file object for both Python 2 and
3.
In Python 3, everything from a file is of byte type and no longer string
type.
........
r17686 | bugman | 2012-10-02 18:48:25 +0200 (Tue, 02 Oct 2012) | 6 lines
The Mf.test_write_results system test can now select the correct file to
compare against in Python 3.
The algorithm for determining if the 'final_results_trunc_1.3_v2' or
'final_results_trunc_1.3_pre_py2.7.3_v2' file should be used could not
handle Python 3.
........
r17687 | bugman | 2012-10-02 18:55:31 +0200 (Tue, 02 Oct 2012) | 5 lines
Another Python 3 fix for the relax_io.extract_data() function.
Sometimes this function sees byte types, sometimes string types. The
function can now handle both.
........
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/data/__init__.py
branches/frame_order_testing/generic_fns/results.py
branches/frame_order_testing/generic_fns/state.py
branches/frame_order_testing/generic_fns/structure/api_base.py
branches/frame_order_testing/opendx/main.py
branches/frame_order_testing/relax_io.py
branches/frame_order_testing/specific_fns/frame_order.py
branches/frame_order_testing/test_suite/system_tests/model_free.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/frame_order_testing/data/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/__init__.py?rev=17842&r1=17841&r2=17842&view=diff
Modified: branches/frame_order_testing/generic_fns/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/results.py?rev=17842&r1=17841&r2=17842&view=diff
Modified: branches/frame_order_testing/generic_fns/state.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/state.py?rev=17842&r1=17841&r2=17842&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=17842&r1=17841&r2=17842&view=diff
Modified: branches/frame_order_testing/opendx/main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/opendx/main.py?rev=17842&r1=17841&r2=17842&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=17842&r1=17841&r2=17842&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=17842&r1=17841&r2=17842&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=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py?rev=17842&r1=17841&r2=17842&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py?rev=17842&r1=17841&r2=17842&view=diff
r17842 - in /branches/frame_order_testing: ./ data/ generic_fns/ generic_fns/structure/ opendx/ specific_fns/ test_suite/sys...