Author: bugman
Date: Tue Oct 16 10:27:57 2012
New Revision: 17832
URL: http://svn.gna.org/viewcvs/relax?rev=17832&view=rev
Log:
Merged revisions 17581-17600 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r17581 | bugman | 2012-09-28 10:58:47 +0200 (Fri, 28 Sep 2012) | 13 lines
Last Python 3 compatibility update for the system tests - they are now both
Python 2 and 3 compatible!
The command used was:
2to3 -w \
-f except \
-f import \
-f imports \
-f long \
-f numliterals \
-f xrange \
.
........
r17582 | bugman | 2012-09-28 11:00:34 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparation - removed all xrange() calls from the unit tests,
these are not needed.
........
r17583 | bugman | 2012-09-28 11:06:47 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - all the _prompt unit tests now use absolute module
imports.
........
r17584 | bugman | 2012-09-28 11:08:34 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparation - all of the _generic_fns unit tests now use absolute
module imports.
........
r17585 | bugman | 2012-09-28 11:09:41 +0200 (Fri, 28 Sep 2012) | 6 lines
Python 3 preparations - the unit tests are now fully Python 2 and 3
compatible.
The command used was:
2to3 -w -f except -f import -f imports -f long -f numliterals -f xrange .
........
r17586 | bugman | 2012-09-28 11:32:12 +0200 (Fri, 28 Sep 2012) | 5 lines
Bug fix for the BMRB system test initialisation for when the bmrblib module
is missing.
The base __init__() method needs to be initialised first.
........
r17587 | bugman | 2012-09-28 11:32:41 +0200 (Fri, 28 Sep 2012) | 3 lines
Removed some temporary debugging code.
........
r17588 | bugman | 2012-09-28 11:34:04 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - the test_suite.gui_tests package now uses absolute
module path imports.
........
r17589 | bugman | 2012-09-28 11:42:00 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - the queue modules for both Python versions are now
supported in the GUI tests.
........
r17590 | bugman | 2012-09-28 11:43:29 +0200 (Fri, 28 Sep 2012) | 6 lines
Python 3 preparations - the GUI tests are now fully Python 2 and 3
compatible.
The command used was:
2to3 -w -f except -f import -f imports -f long -f numliterals -f xrange .
........
r17591 | bugman | 2012-09-28 11:45:14 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - the use of the queue module in the status module is
now compatible with 2 and 3.
........
r17592 | bugman | 2012-09-28 11:49:34 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparation - the auto_analyses package now uses absolute paths
for the module imports.
........
r17593 | bugman | 2012-09-28 11:50:34 +0200 (Fri, 28 Sep 2012) | 6 lines
Python 3 preparations - the auto_analyses package is now fully Python 2 and
3 compatible.
The command used was:
2to3 -w -f except -f import -f imports -f long -f numliterals -f xrange .
........
r17594 | bugman | 2012-09-28 13:28:49 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparation - the use of an absolute module path for import.
........
r17595 | bugman | 2012-09-28 13:29:29 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparation - eliminated the unneeded use of xrange().
........
r17596 | bugman | 2012-09-28 13:36:50 +0200 (Fri, 28 Sep 2012) | 6 lines
Python 3 preparations - removed all usage of the xrange() in the
generic_fns package as none are needed.
The command used was:
2to3 -w -f xrange .
........
r17597 | bugman | 2012-09-28 14:23:58 +0200 (Fri, 28 Sep 2012) | 3 lines
Updated the Python 2 to 3 checklist document for the shifting of the
'relax' file to 'relax.py'.
........
r17598 | bugman | 2012-09-28 16:40:50 +0200 (Fri, 28 Sep 2012) | 17 lines
Python 3 conversions using 2to3.
The command used was:
2to3 -w \
-f buffer \
-f idioms \
-f set_literal \
-f ws_comma \
-x except \
-x import \
-x imports \
-x long \
-x numliterals \
-x xrange \
.
........
r17599 | bugman | 2012-09-28 16:57:03 +0200 (Fri, 28 Sep 2012) | 6 lines
Reverted r17598 for the multi.processor module as this breaks in Python 2.
The command used was:
svn merge -r17598:r17597 processor.py
........
r17600 | bugman | 2012-09-28 16:58:29 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - exception handling fix to be Python 2.4+ compatible.
........
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/auto_analyses/__init__.py
branches/frame_order_testing/auto_analyses/dauvergne_protocol.py
branches/frame_order_testing/auto_analyses/stereochem_analysis.py
branches/frame_order_testing/docs/2to3_checklist
branches/frame_order_testing/generic_fns/align_tensor.py
branches/frame_order_testing/generic_fns/diffusion_tensor.py
branches/frame_order_testing/generic_fns/eliminate.py
branches/frame_order_testing/generic_fns/minimise.py
branches/frame_order_testing/generic_fns/model_selection.py
branches/frame_order_testing/generic_fns/mol_res_spin.py
branches/frame_order_testing/generic_fns/monte_carlo.py
branches/frame_order_testing/generic_fns/palmer.py
branches/frame_order_testing/generic_fns/pipes.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/geometric.py
branches/frame_order_testing/generic_fns/structure/internal.py
branches/frame_order_testing/generic_fns/structure/main.py
branches/frame_order_testing/generic_fns/structure/scientific.py
branches/frame_order_testing/generic_fns/value.py
branches/frame_order_testing/generic_fns/vmd.py
branches/frame_order_testing/graphics/wizards/dipole_pair/VectorFieldPlot.py
branches/frame_order_testing/gui/misc.py
branches/frame_order_testing/prompt/uf_docstring.py
branches/frame_order_testing/relax.py
branches/frame_order_testing/status.py
branches/frame_order_testing/test_suite/gui_tests/__init__.py
branches/frame_order_testing/test_suite/gui_tests/base_classes.py
branches/frame_order_testing/test_suite/gui_tests/dead_uf_pages.py
branches/frame_order_testing/test_suite/gui_tests/model_free.py
branches/frame_order_testing/test_suite/system_tests/bmrb.py
branches/frame_order_testing/test_suite/system_tests/model_free.py
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_molecule.py
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_residue.py
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_spin.py
branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_kronecker_product.py
branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_n_state_model.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_align_tensor.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_dasha.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_deselect.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_diffusion_tensor.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_eliminate.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_minimisation.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_model_free.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_molecule.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_molmol.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_n_state_model.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_noe.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_pymol.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_relax_data.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_relax_fit.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_residue.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_select.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_sequence.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_spectrum.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_spin.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_state.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_structure.py
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_value.py
branches/frame_order_testing/test_suite/unit_tests/_specific_fns/test_n_state_model.py
branches/frame_order_testing/test_suite/unit_tests/relax_data_testing_base.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/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/auto_analyses/__init__.py?rev=17832&r1=17831&r2=17832&view=diff
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=17832&r1=17831&r2=17832&view=diff
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=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/docs/2to3_checklist
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/docs/2to3_checklist?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/align_tensor.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/diffusion_tensor.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/eliminate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/eliminate.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/minimise.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/model_selection.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/model_selection.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/mol_res_spin.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/mol_res_spin.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/monte_carlo.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/monte_carlo.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/palmer.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/pipes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/pipes.py?rev=17832&r1=17831&r2=17832&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=17832&r1=17831&r2=17832&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=17832&r1=17831&r2=17832&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=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/structure/geometric.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/geometric.py?rev=17832&r1=17831&r2=17832&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=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/structure/main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/main.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/structure/scientific.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/scientific.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/value.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/generic_fns/vmd.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/vmd.py?rev=17832&r1=17831&r2=17832&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=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/gui/misc.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/misc.py?rev=17832&r1=17831&r2=17832&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=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/relax.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/status.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/status.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/test_suite/gui_tests/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/gui_tests/__init__.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/test_suite/gui_tests/base_classes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/gui_tests/base_classes.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/test_suite/gui_tests/dead_uf_pages.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/gui_tests/dead_uf_pages.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/test_suite/gui_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/gui_tests/model_free.py?rev=17832&r1=17831&r2=17832&view=diff
Modified: branches/frame_order_testing/test_suite/system_tests/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/bmrb.py?rev=17832&r1=17831&r2=17832&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=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_molecule.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_molecule.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_residue.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_residue.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_spin.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_generic_fns/test_spin.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_kronecker_product.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_kronecker_product.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_maths_fns/test_n_state_model.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_prompt/test_align_tensor.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_prompt/test_dasha.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_deselect.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_prompt/test_deselect.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_prompt/test_diffusion_tensor.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_eliminate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_prompt/test_eliminate.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_minimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_prompt/test_minimisation.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_prompt/test_model_free.py?rev=17832&r1=17831&r2=17832&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_prompt/test_molecule.py
[... 53 lines stripped ...]
r17832 - in /branches/frame_order_testing: ./ auto_analyses/ docs/ generic_fns/ generic_fns/structure/ graphics/wizards/dipo...