Author: bugman
Date: Tue Oct 16 10:43:04 2012
New Revision: 17837
URL: http://svn.gna.org/viewcvs/relax?rev=17837&view=rev
Log:
Merged revisions 17641-17650 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r17641 | bugman | 2012-10-01 23:34:42 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - eliminated the use of the map() function, as this behaves
differently in Python 3.
........
r17642 | bugman | 2012-10-01 23:40:37 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - Eliminated an unneeded xrange call.
........
r17643 | bugman | 2012-10-02 00:37:08 +0200 (Tue, 02 Oct 2012) | 3 lines
Created the special check_types.is_filetype() function for checking for
files in all Python versions.
........
r17644 | bugman | 2012-10-02 01:16:44 +0200 (Tue, 02 Oct 2012) | 5 lines
Fix for a bug introduced at r17624 in the
generic_fns.sequence.validate_sequence() function.
The is_none() function call doesn't seem to be working correctly.
........
r17645 | bugman | 2012-10-02 10:23:28 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 preparations - mass conversion of all xrange() calls to range().
........
r17646 | bugman | 2012-10-02 10:26:09 +0200 (Tue, 02 Oct 2012) | 6 lines
Python 3 fixes - the list() function is now used in combination with
range() to generate the ordered list.
range() in Python 3 is an iterator object (just as xrange was), so now the
list() function has to be
called.
........
r17647 | bugman | 2012-10-02 10:35:22 +0200 (Tue, 02 Oct 2012) | 3 lines
Created a new module for simultaneous Python 2 and 3 support in relax
called 'compat'.
........
r17648 | bugman | 2012-10-02 10:45:46 +0200 (Tue, 02 Oct 2012) | 9 lines
Converted the ScientificPython PDB reader to support both Python 2 and 3.
The command used was:
2to3 extern/scientific_python/IO/PDB.py -w
The __repr__() method was manually modified due to the 'list' variable
clashing with the 'list'
type.
........
r17649 | bugman | 2012-10-02 10:47:48 +0200 (Tue, 02 Oct 2012) | 3 lines
Converted some raise() function calls to raise statements in preparation
for the 2to3 conversion.
........
r17650 | bugman | 2012-10-02 10:49:09 +0200 (Tue, 02 Oct 2012) | 3 lines
Another raise() function call to statement change for 2to3 preparations.
........
Added:
branches/frame_order_testing/check_types.py
- copied unchanged from r17650, trunk/check_types.py
branches/frame_order_testing/compat.py
- copied unchanged from r17650, trunk/compat.py
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/arg_check.py
branches/frame_order_testing/data/align_tensor.py
branches/frame_order_testing/data/data_classes.py
branches/frame_order_testing/data/interatomic.py
branches/frame_order_testing/data/mol_res_spin.py
branches/frame_order_testing/docs/latex/curvefit.tex
branches/frame_order_testing/docs/latex/fetch_docstrings.py
branches/frame_order_testing/extern/scientific_python/IO/PDB.py
branches/frame_order_testing/generic_fns/mol_res_spin.py
branches/frame_order_testing/generic_fns/sequence.py
branches/frame_order_testing/maths_fns/chi2.py
branches/frame_order_testing/maths_fns/mf.py
branches/frame_order_testing/maths_fns/n_state_model.py
branches/frame_order_testing/maths_fns/pcs.py
branches/frame_order_testing/maths_fns/potential.py
branches/frame_order_testing/maths_fns/rdc.py
branches/frame_order_testing/maths_fns/ri_comps.py
branches/frame_order_testing/opendx/base_map.py
branches/frame_order_testing/opendx/isosurface_3D.py
branches/frame_order_testing/prompt/tab_completion.py
branches/frame_order_testing/relax.py
branches/frame_order_testing/relax_errors.py
branches/frame_order_testing/relax_io.py
branches/frame_order_testing/sample_scripts/model_free/cv.py
branches/frame_order_testing/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
branches/frame_order_testing/sample_scripts/n_state_model/local_min_search.py
branches/frame_order_testing/sample_scripts/relax_curve_diff.py
branches/frame_order_testing/sample_scripts/relax_fit.py
branches/frame_order_testing/scons/distrib.py
branches/frame_order_testing/scons/manuals.py
branches/frame_order_testing/scripts/code_validator
branches/frame_order_testing/specific_fns/api_common.py
branches/frame_order_testing/specific_fns/frame_order.py
branches/frame_order_testing/specific_fns/hybrid.py
branches/frame_order_testing/specific_fns/model_free/bmrb.py
branches/frame_order_testing/specific_fns/model_free/main.py
branches/frame_order_testing/specific_fns/model_free/mf_minimise.py
branches/frame_order_testing/specific_fns/model_free/results.py
branches/frame_order_testing/specific_fns/n_state_model.py
branches/frame_order_testing/specific_fns/relax_fit.py
branches/frame_order_testing/test_suite/formatting.py
branches/frame_order_testing/test_suite/shared_data/bruker_files/relax_fit.py
branches/frame_order_testing/test_suite/shared_data/bruker_files/relax_fit_pdc_err.py
branches/frame_order_testing/test_suite/shared_data/model_free/sphere/create_sphere.py
branches/frame_order_testing/test_suite/unit_tests/unit_test_runner.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/frame_order_testing/arg_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/arg_check.py?rev=17837&r1=17836&r2=17837&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=17837&r1=17836&r2=17837&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=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/data/interatomic.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/interatomic.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/data/mol_res_spin.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/mol_res_spin.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/docs/latex/curvefit.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/docs/latex/curvefit.tex?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/docs/latex/fetch_docstrings.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/docs/latex/fetch_docstrings.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/extern/scientific_python/IO/PDB.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/IO/PDB.py?rev=17837&r1=17836&r2=17837&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=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/generic_fns/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/sequence.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/maths_fns/chi2.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/chi2.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/maths_fns/mf.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/mf.py?rev=17837&r1=17836&r2=17837&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=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/maths_fns/pcs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/pcs.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/maths_fns/potential.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/potential.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/maths_fns/rdc.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/rdc.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/maths_fns/ri_comps.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/ri_comps.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/opendx/base_map.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/opendx/base_map.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/opendx/isosurface_3D.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/opendx/isosurface_3D.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/prompt/tab_completion.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/prompt/tab_completion.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/relax.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax.py?rev=17837&r1=17836&r2=17837&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=17837&r1=17836&r2=17837&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=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/sample_scripts/model_free/cv.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/model_free/cv.py?rev=17837&r1=17836&r2=17837&view=diff
Modified:
branches/frame_order_testing/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/n_state_model/conformation_analysis_rdc%2Bpcs.py?rev=17837&r1=17836&r2=17837&view=diff
Modified:
branches/frame_order_testing/sample_scripts/n_state_model/local_min_search.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/n_state_model/local_min_search.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/sample_scripts/relax_curve_diff.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/relax_curve_diff.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/sample_scripts/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/relax_fit.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/scons/distrib.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/scons/distrib.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/scons/manuals.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/scons/manuals.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/scripts/code_validator
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/scripts/code_validator?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/specific_fns/api_common.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/api_common.py?rev=17837&r1=17836&r2=17837&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=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/specific_fns/hybrid.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/hybrid.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/specific_fns/model_free/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/bmrb.py?rev=17837&r1=17836&r2=17837&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=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/specific_fns/model_free/mf_minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/mf_minimise.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/specific_fns/model_free/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/results.py?rev=17837&r1=17836&r2=17837&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=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/relax_fit.py?rev=17837&r1=17836&r2=17837&view=diff
Modified: branches/frame_order_testing/test_suite/formatting.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/formatting.py?rev=17837&r1=17836&r2=17837&view=diff
Modified:
branches/frame_order_testing/test_suite/shared_data/bruker_files/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/bruker_files/relax_fit.py?rev=17837&r1=17836&r2=17837&view=diff
Modified:
branches/frame_order_testing/test_suite/shared_data/bruker_files/relax_fit_pdc_err.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/bruker_files/relax_fit_pdc_err.py?rev=17837&r1=17836&r2=17837&view=diff
Modified:
branches/frame_order_testing/test_suite/shared_data/model_free/sphere/create_sphere.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/model_free/sphere/create_sphere.py?rev=17837&r1=17836&r2=17837&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/unit_test_runner.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/unit_test_runner.py?rev=17837&r1=17836&r2=17837&view=diff
r17837 - in /branches/frame_order_testing: ./ data/ docs/latex/ extern/scientific_python/IO/ generic_fns/ maths_fns/ opendx/...