Author: bugman
Date: Tue Oct 16 10:42:15 2012
New Revision: 17836
URL: http://svn.gna.org/viewcvs/relax?rev=17836&view=rev
Log:
Merged revisions 17624-17640 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r17624 | bugman | 2012-10-01 21:33:21 +0200 (Mon, 01 Oct 2012) | 5 lines
Python 3 - removed the use of the types module from generic_fns.sequence.
The relax arg_check module is now being used instead.
........
r17625 | bugman | 2012-10-01 21:34:01 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - a pile of relative path fixes for many relax modules.
........
r17626 | bugman | 2012-10-01 21:44:20 +0200 (Mon, 01 Oct 2012) | 5 lines
Python 3 - Fix for an os.chmod() call by using the stat module rather than
the number 0775.
The number 0755 is no longer valid in Python 3.
........
r17627 | bugman | 2012-10-01 21:48:28 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - converted some print statements to function calls in the
ScientificPython modules.
........
r17628 | bugman | 2012-10-01 21:52:19 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - modified some except statements to be Python 2.4+ compatible in
a ScientificPython module.
........
r17629 | bugman | 2012-10-01 22:12:24 +0200 (Mon, 01 Oct 2012) | 6 lines
Python 3 - a number of fixes for running the ScientificPython modules in
relax on Python 2 and 3.
This includes relative imports, converting raise statements to function
calls, removal of the use of
many string module functions which do not exist in Python 3, etc.
........
r17630 | bugman | 2012-10-01 22:15:43 +0200 (Mon, 01 Oct 2012) | 6 lines
Python 3 - removal of the use of the string.atoi and string.atof functions.
These have been depreciated since Python 2.0!! They have been replace by
the int and float
functions.
........
r17631 | bugman | 2012-10-01 22:22:34 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - converted the last of the except error catching statements to be
Python 2.4+ compatible.
........
r17632 | bugman | 2012-10-01 22:27:00 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - fixes for the renaming of the Queue package.
........
r17633 | bugman | 2012-10-01 22:41:26 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 fix - ensure an integer is actually an integer (division now
converts ints to floats).
........
r17634 | bugman | 2012-10-01 22:43:38 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 fixes for the version module for catching empty lists.
........
r17635 | bugman | 2012-10-01 22:51:12 +0200 (Mon, 01 Oct 2012) | 3 lines
Debugging printout removal.
........
r17636 | bugman | 2012-10-01 22:54:43 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - relative module paths are now used for the test suite runner.
........
r17637 | bugman | 2012-10-01 22:55:29 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - The cStringIO.StringIO import switches to io.StringIO if missing.
........
r17638 | bugman | 2012-10-01 23:06:27 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 2 fixes - the Python 3 fixes for the ScientificPython module imports
broke Python 2.
........
r17639 | bugman | 2012-10-01 23:19:57 +0200 (Mon, 01 Oct 2012) | 5 lines
Python 3 fix for the relax information print out.
The try blocks seem to now operate slightly differently in Python 3.
........
r17640 | bugman | 2012-10-01 23:34:08 +0200 (Mon, 01 Oct 2012) | 3 lines
Python 3 - removed the use of the string.lower() function as it is missing
in Python 3.
........
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py
branches/frame_order_testing/extern/scientific_python/Geometry/__init__.py
branches/frame_order_testing/extern/scientific_python/IO/ArrayIO.py
branches/frame_order_testing/extern/scientific_python/IO/FortranFormat.py
branches/frame_order_testing/extern/scientific_python/IO/PDB.py
branches/frame_order_testing/extern/scientific_python/IO/TextFile.py
branches/frame_order_testing/generic_fns/diffusion_tensor.py
branches/frame_order_testing/generic_fns/palmer.py
branches/frame_order_testing/generic_fns/sequence.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/scientific.py
branches/frame_order_testing/gui/controller.py
branches/frame_order_testing/gui/interpreter.py
branches/frame_order_testing/gui/misc.py
branches/frame_order_testing/gui/uf_objects.py
branches/frame_order_testing/info.py
branches/frame_order_testing/maths_fns/consistency_tests.py
branches/frame_order_testing/maths_fns/jw_mapping.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/ri.py
branches/frame_order_testing/multi/multi_processor_base.py
branches/frame_order_testing/multi/processor.py
branches/frame_order_testing/multi/result_queue.py
branches/frame_order_testing/opendx/isosurface_3D.py
branches/frame_order_testing/opendx/main.py
branches/frame_order_testing/scons/install.py
branches/frame_order_testing/scons/manuals.py
branches/frame_order_testing/specific_fns/consistency_tests.py
branches/frame_order_testing/specific_fns/frame_order.py
branches/frame_order_testing/specific_fns/hybrid.py
branches/frame_order_testing/specific_fns/jw_mapping.py
branches/frame_order_testing/specific_fns/model_free/__init__.py
branches/frame_order_testing/specific_fns/model_free/mf_minimise.py
branches/frame_order_testing/specific_fns/noe/__init__.py
branches/frame_order_testing/specific_fns/relax_fit.py
branches/frame_order_testing/test_suite/gui_tests/dead_uf_pages.py
branches/frame_order_testing/test_suite/relax_test_runner.py
branches/frame_order_testing/test_suite/system_tests/dasha.py
branches/frame_order_testing/test_suite/test_suite_runner.py
branches/frame_order_testing/test_suite/unit_tests/unit_test_runner.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/extern/scientific_python/Geometry/TensorModule.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py?rev=17836&r1=17835&r2=17836&view=diff
Modified:
branches/frame_order_testing/extern/scientific_python/Geometry/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/Geometry/__init__.py?rev=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/extern/scientific_python/IO/ArrayIO.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/IO/ArrayIO.py?rev=17836&r1=17835&r2=17836&view=diff
Modified:
branches/frame_order_testing/extern/scientific_python/IO/FortranFormat.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/IO/FortranFormat.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/extern/scientific_python/IO/TextFile.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/IO/TextFile.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/gui/controller.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/controller.py?rev=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/gui/interpreter.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/interpreter.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/info.py?rev=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/maths_fns/consistency_tests.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/consistency_tests.py?rev=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/maths_fns/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/jw_mapping.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/maths_fns/ri.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/ri.py?rev=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/multi/multi_processor_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/multi/multi_processor_base.py?rev=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/multi/processor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/multi/processor.py?rev=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/multi/result_queue.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/multi/result_queue.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/scons/install.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/scons/install.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/specific_fns/consistency_tests.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/consistency_tests.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/specific_fns/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/jw_mapping.py?rev=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/specific_fns/model_free/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/__init__.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/specific_fns/noe/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/noe/__init__.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/test_suite/relax_test_runner.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/relax_test_runner.py?rev=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/test_suite/system_tests/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/dasha.py?rev=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&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=17836&r1=17835&r2=17836&view=diff
Modified: branches/frame_order_testing/version.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/version.py?rev=17836&r1=17835&r2=17836&view=diff
r17836 - in /branches/frame_order_testing: ./ extern/scientific_python/Geometry/ extern/scientific_python/IO/ generic_fns/ g...