Author: bugman
Date: Tue Oct 16 10:52:33 2012
New Revision: 17839
URL: http://svn.gna.org/viewcvs/relax?rev=17839&view=rev
Log:
Merged revisions 17661-17670 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r17661 | bugman | 2012-10-02 14:08:22 +0200 (Tue, 02 Oct 2012) | 5 lines
Fix for the test suite summary for Python 3.
The test suite now runs, but fails miserably, under Python 3.
........
r17662 | bugman | 2012-10-02 14:16:02 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 fixes - the character '\' is now properly escaped as '\\' in the
stereochemistry auto-analysis.
........
r17663 | bugman | 2012-10-02 14:18:41 +0200 (Tue, 02 Oct 2012) | 6 lines
Python 3 fix - the relax_errors.AllRelaxErrors object is now a proper tuple.
Due to bad coding, it was previously a nested tuple. This nested tuple
worked in Python 2, but is
fatal for Python 3.
........
r17664 | bugman | 2012-10-02 14:23:43 +0200 (Tue, 02 Oct 2012) | 6 lines
Python 3 preparation - the relax data store (the data package) now supports
both Python 2 and 3.
The command used was:
2to3 -w data/__init__.py
........
r17665 | bugman | 2012-10-02 14:25:52 +0200 (Tue, 02 Oct 2012) | 5 lines
Better support for both Python 2 and 3 in the relax data store.
The 2to3 script was used on all of the files in the data package.
........
r17666 | bugman | 2012-10-02 14:37:01 +0200 (Tue, 02 Oct 2012) | 7 lines
Python 3 bug fix for the state.load user function.
The header line of pickled states (rather than the standard XML states) is
of the b'' byte format.
This is now converted to a string, and the search expression is comparing
it to the raw string
r"<\?xml".
........
r17667 | bugman | 2012-10-02 15:18:32 +0200 (Tue, 02 Oct 2012) | 6 lines
Python 3 bug fix for the relax_io.read_spin_data() function.
The built in max() function cannot handle the value of None, therefore the
filter() function is used
to remove all instances of None from the list.
........
r17668 | bugman | 2012-10-02 15:19:32 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 fix for the results.read user function matching that of state.load
at r17666.
........
r17669 | bugman | 2012-10-02 15:42:37 +0200 (Tue, 02 Oct 2012) | 6 lines
Python 3 fix for the reading of text from a bz2 file.
In Python 3, the readlines() function was returning a list of bytes types,
not a list of strings.
The relax_io.extract_data() function now detects this and converts to
string when possible.
........
r17670 | bugman | 2012-10-02 15:44:24 +0200 (Tue, 02 Oct 2012) | 5 lines
Python 3 bug fix for the N-state model target function setup.
The num_tensors variable needs to be an integer, but the Python 3 division
will create a float type.
........
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/auto_analyses/stereochem_analysis.py
branches/frame_order_testing/data/__init__.py
branches/frame_order_testing/data/align_tensor.py
branches/frame_order_testing/data/data_classes.py
branches/frame_order_testing/data/diff_tensor.py
branches/frame_order_testing/data/relax_xml.py
branches/frame_order_testing/generic_fns/results.py
branches/frame_order_testing/generic_fns/state.py
branches/frame_order_testing/maths_fns/n_state_model.py
branches/frame_order_testing/relax_errors.py
branches/frame_order_testing/relax_io.py
branches/frame_order_testing/test_suite/test_suite_runner.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/frame_order_testing/auto_analyses/stereochem_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/auto_analyses/stereochem_analysis.py?rev=17839&r1=17838&r2=17839&view=diff
Modified: branches/frame_order_testing/data/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/__init__.py?rev=17839&r1=17838&r2=17839&view=diff
Modified: branches/frame_order_testing/data/align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/align_tensor.py?rev=17839&r1=17838&r2=17839&view=diff
Modified: branches/frame_order_testing/data/data_classes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/data_classes.py?rev=17839&r1=17838&r2=17839&view=diff
Modified: branches/frame_order_testing/data/diff_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/diff_tensor.py?rev=17839&r1=17838&r2=17839&view=diff
Modified: branches/frame_order_testing/data/relax_xml.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/relax_xml.py?rev=17839&r1=17838&r2=17839&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=17839&r1=17838&r2=17839&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=17839&r1=17838&r2=17839&view=diff
Modified: branches/frame_order_testing/maths_fns/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/n_state_model.py?rev=17839&r1=17838&r2=17839&view=diff
Modified: branches/frame_order_testing/relax_errors.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax_errors.py?rev=17839&r1=17838&r2=17839&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=17839&r1=17838&r2=17839&view=diff
Modified: branches/frame_order_testing/test_suite/test_suite_runner.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/test_suite_runner.py?rev=17839&r1=17838&r2=17839&view=diff
r17839 - in /branches/frame_order_testing: ./ auto_analyses/ data/ generic_fns/ maths_fns/ test_suite/