Author: bugman
Date: Tue Oct 16 10:29:42 2012
New Revision: 17833
URL: http://svn.gna.org/viewcvs/relax?rev=17833&view=rev
Log:
Merged revisions 17601-17620 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r17601 | bugman | 2012-09-28 17:17:05 +0200 (Fri, 28 Sep 2012) | 3 lines
More exception handling changes to be Python 2.4+ compatible.
........
r17602 | bugman | 2012-09-28 17:22:32 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - eliminated the use of the os.popen3 function from
the info module.
........
r17603 | bugman | 2012-09-28 17:28:11 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - all os.popen3() instances in relax have been
replaced by the subprocess module.
........
r17604 | bugman | 2012-09-28 17:28:56 +0200 (Fri, 28 Sep 2012) | 3 lines
Removed an unused import (which was breaking relax in Python 3).
........
r17605 | bugman | 2012-09-28 17:55:25 +0200 (Fri, 28 Sep 2012) | 3 lines
Removed the completely unused gui.components.conversion module.
........
r17606 | bugman | 2012-09-28 18:08:24 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - all usage of string.split() and string.strip() has
been eliminated.
........
r17607 | bugman | 2012-09-28 18:11:48 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - compatibility for both the Python 2 cPickle and
Python 3 pickle modules.
........
r17608 | bugman | 2012-09-28 18:20:48 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - removed the use of the types.ClassType object.
........
r17609 | bugman | 2012-09-28 18:32:10 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - converted the relax prompt/script interpreter to be
Python 2 and 3 compatible.
........
r17610 | bugman | 2012-09-28 18:34:49 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - error handling is now Python 2 and 3 compatible in
the relax_io module.
........
r17611 | bugman | 2012-09-28 18:50:32 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparation - all raising of RelaxErrors is now Python 2.4+
compatible.
........
r17612 | bugman | 2012-09-28 18:52:10 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - more exception handling updates for all Python 2.4+
versions.
........
r17613 | bugman | 2012-09-28 18:55:04 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - absolute module path fix.
........
r17614 | bugman | 2012-09-28 18:57:45 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - support for both Python 2 __builtin__ and Python 3
builtins modules.
........
r17615 | bugman | 2012-09-28 18:58:47 +0200 (Fri, 28 Sep 2012) | 3 lines
Bug fix for a problem introduced in the last commit.
........
r17616 | bugman | 2012-09-28 19:02:02 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - absolute module path fixes.
........
r17617 | bugman | 2012-09-28 19:04:46 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - eliminated the use of the types.ListType object.
........
r17618 | bugman | 2012-09-28 19:06:23 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - the data package now uses absolute imports for all
its modules.
........
r17619 | bugman | 2012-09-28 19:13:09 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - the data package now really does use the absolute
path for its module imports.
........
r17620 | bugman | 2012-09-28 19:13:30 +0200 (Fri, 28 Sep 2012) | 3 lines
Python 3 preparations - removal of some unneeded xrange() calls.
........
Removed:
branches/frame_order_testing/gui/components/conversion.py
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/exp_info.py
branches/frame_order_testing/data/gui.py
branches/frame_order_testing/data/interatomic.py
branches/frame_order_testing/data/mol_res_spin.py
branches/frame_order_testing/data/pipe_container.py
branches/frame_order_testing/data/relax_xml.py
branches/frame_order_testing/dep_check.py
branches/frame_order_testing/docs/latex/fetch_docstrings.py
branches/frame_order_testing/float.py
branches/frame_order_testing/generic_fns/angles.py
branches/frame_order_testing/generic_fns/bruker.py
branches/frame_order_testing/generic_fns/dasha.py
branches/frame_order_testing/generic_fns/mol_res_spin.py
branches/frame_order_testing/generic_fns/molmol.py
branches/frame_order_testing/generic_fns/noesy.py
branches/frame_order_testing/generic_fns/palmer.py
branches/frame_order_testing/generic_fns/pcs.py
branches/frame_order_testing/generic_fns/pipes.py
branches/frame_order_testing/generic_fns/rdc.py
branches/frame_order_testing/generic_fns/results.py
branches/frame_order_testing/generic_fns/state.py
branches/frame_order_testing/generic_fns/structure/internal.py
branches/frame_order_testing/generic_fns/xplor.py
branches/frame_order_testing/graphics/__init__.py
branches/frame_order_testing/gui/about.py
branches/frame_order_testing/gui/relax_gui.py
branches/frame_order_testing/gui/spin_viewer/containers.py
branches/frame_order_testing/gui/string_conv.py
branches/frame_order_testing/gui/uf_objects.py
branches/frame_order_testing/info.py
branches/frame_order_testing/prompt/interpreter.py
branches/frame_order_testing/prompt/uf_docstring.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/relax_string.py
branches/frame_order_testing/scripts/code_validator
branches/frame_order_testing/scripts/framework_bin_test
branches/frame_order_testing/scripts/optimisation_testing.py
branches/frame_order_testing/setup.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/status.py
branches/frame_order_testing/test_suite/gui_tests/__init__.py
branches/frame_order_testing/test_suite/shared_data/align_data/CaM/randomise.py
branches/frame_order_testing/test_suite/shared_data/bruker_files/convert_data_noe.py
branches/frame_order_testing/test_suite/shared_data/bruker_files/convert_data_r1.py
branches/frame_order_testing/test_suite/system_tests/__init__.py
branches/frame_order_testing/test_suite/system_tests/grace.py
branches/frame_order_testing/test_suite/system_tests/relax_fit.py
branches/frame_order_testing/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py
branches/frame_order_testing/test_suite/system_tests/scripts/diff_tensor/tensor_opt.py
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/populations.py
branches/frame_order_testing/user_functions/data.py
branches/frame_order_testing/user_functions/minimisation.py
branches/frame_order_testing/version.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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/data/exp_info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/exp_info.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/data/gui.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/gui.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/data/pipe_container.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/pipe_container.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/dep_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/dep_check.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/float.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/float.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/generic_fns/angles.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/angles.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/generic_fns/bruker.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/bruker.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/generic_fns/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/dasha.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/generic_fns/molmol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/molmol.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/generic_fns/noesy.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/noesy.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/generic_fns/xplor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/xplor.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/graphics/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/graphics/__init__.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/gui/about.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/about.py?rev=17833&r1=17832&r2=17833&view=diff
Removed: branches/frame_order_testing/gui/components/conversion.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/components/conversion.py?rev=17832&view=auto
Modified: branches/frame_order_testing/gui/relax_gui.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/relax_gui.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/gui/spin_viewer/containers.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/spin_viewer/containers.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/gui/string_conv.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/string_conv.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/gui/uf_objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/uf_objects.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/info.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/prompt/interpreter.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/prompt/interpreter.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/relax.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/relax_string.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax_string.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/scripts/framework_bin_test
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/scripts/framework_bin_test?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/scripts/optimisation_testing.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/scripts/optimisation_testing.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/setup.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/setup.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/status.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/status.py?rev=17833&r1=17832&r2=17833&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=17833&r1=17832&r2=17833&view=diff
Modified:
branches/frame_order_testing/test_suite/shared_data/align_data/CaM/randomise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/align_data/CaM/randomise.py?rev=17833&r1=17832&r2=17833&view=diff
Modified:
branches/frame_order_testing/test_suite/shared_data/bruker_files/convert_data_noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/bruker_files/convert_data_noe.py?rev=17833&r1=17832&r2=17833&view=diff
Modified:
branches/frame_order_testing/test_suite/shared_data/bruker_files/convert_data_r1.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/bruker_files/convert_data_r1.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/test_suite/system_tests/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/__init__.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/test_suite/system_tests/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/grace.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/test_suite/system_tests/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/relax_fit.py?rev=17833&r1=17832&r2=17833&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py?rev=17833&r1=17832&r2=17833&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/diff_tensor/tensor_opt.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/diff_tensor/tensor_opt.py?rev=17833&r1=17832&r2=17833&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/populations.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/populations.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/user_functions/data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/user_functions/data.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/user_functions/minimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/user_functions/minimisation.py?rev=17833&r1=17832&r2=17833&view=diff
Modified: branches/frame_order_testing/version.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/version.py?rev=17833&r1=17832&r2=17833&view=diff
r17833 - in /branches/frame_order_testing: ./ auto_analyses/ data/ docs/latex/ generic_fns/ generic_fns/structure/ graphics/...