[r17844]
by
bugman
Merged revisions 17693,17697-17737 via svnmerge from
svn+ssh://bugman@.../svn/relax/trunk
........
r17693 | bugman | 2012-10-03 22:46:34 +0200 (Wed, 03 Oct 2012) | 6 lines
Fix to the DummyFileObject to allow Python 2.5 and lower to run relax.
The byte arrays are now placed in eval() statements to allow the 2.5 and lower interpreters to parse
the code.
........
r17697 | bugman | 2012-10-04 18:20:51 +0200 (Thu, 04 Oct 2012) | 7 lines
Added the Mf.test_bug_20213_asn_sidechain() system test to catch bug #20213.
The data and script comes from the files 'sh3-47.2.zip' and 'run.py' attached to the bug report
https://gna.org/bugs/?20213. The PDB now only contains Asp47, the optimisation parameters have been
made almost insignificant, and all models but 'tm0' have been removed from the analysis.
........
r17698 | bugman | 2012-10-04 18:23:16 +0200 (Thu, 04 Oct 2012) | 3 lines
The Mf.test_bug_20213_asn_sidechain() system test now uses a temporary directory for output.
........
r17699 | bugman | 2012-10-04 18:37:56 +0200 (Thu, 04 Oct 2012) | 5 lines
Created the simple Sequence.test_sequence_copy() system test to catch bug #20213.
https://gna.org/bugs/?20213.
........
r17700 | bugman | 2012-10-04 19:02:08 +0200 (Thu, 04 Oct 2012) | 8 lines
Fix for bug #20213 (https://gna.org/bugs/?20213).
The problem was that the generic_fns.sequence.generate() function was searching for a spin based on
its spin ID generated from the spin name and not spin number. Hence two spins with the same name
but different numbers were treated as the same spin, and only data from one was being generated via
the copy() function.
........
r17701 | bugman | 2012-10-05 18:42:15 +0200 (Fri, 05 Oct 2012) | 8 lines
Created the relax_io.readlines method for handling the bz2 and gzip module byte strings in Python 3.
The bz2.BZ2File and gzip.GzipFile classes now return lists of bytes strings from their readlines()
methods in Python 3. This causes failures all over relax. This behaviour is probably a bug in
these classes. The relax_io.readlines method is a workaround for this problem, to have a list of
standard strings returned.
........
r17702 | bugman | 2012-10-05 18:43:11 +0200 (Fri, 05 Oct 2012) | 3 lines
Python 3 bug fix for the internal PDB and XYZ 3D structure readers by using relax_io.readlines().
........
r17703 | bugman | 2012-10-05 19:39:17 +0200 (Fri, 05 Oct 2012) | 3 lines
First attempt at making the relaxation curve-fitting C module Python 3 compatible.
........
r17704 | bugman | 2012-10-05 19:45:46 +0200 (Fri, 05 Oct 2012) | 3 lines
The relaxation curve-fitting C module now supports compilation on both Python 2 and 3.
........
r17705 | bugman | 2012-10-05 19:48:03 +0200 (Fri, 05 Oct 2012) | 6 lines
The relax_fit specific analysis module now supports both Python 2 and 3.
The command used was:
2to3 -w specific_fns/relax_fit.py
........
r17706 | bugman | 2012-10-07 15:00:19 +0200 (Sun, 07 Oct 2012) | 3 lines
Added a script for testing out the C module compilation on multiple python targets.
........
r17707 | bugman | 2012-10-07 15:13:52 +0200 (Sun, 07 Oct 2012) | 3 lines
Finished off the C module compilation testing script.
........
r17708 | bugman | 2012-10-07 15:16:28 +0200 (Sun, 07 Oct 2012) | 3 lines
Renamed the 'scripts' directory to 'devel_scripts' so that users are less likely to ask about the scripts.
........
r17709 | bugman | 2012-10-07 15:26:15 +0200 (Sun, 07 Oct 2012) | 3 lines
The manual C module compilation script is now executable.
........
r17710 | bugman | 2012-10-07 15:37:52 +0200 (Sun, 07 Oct 2012) | 3 lines
Added the IO module to the relax information print out and dependency checks.
........
r17711 | bugman | 2012-10-07 15:40:50 +0200 (Sun, 07 Oct 2012) | 7 lines
The relax_io.open_read_file() now supports all Python versions over 2.4.
This required some really nasty hacks for Python 3.0, 3.1 and 3.2 with the Bzip2Fixed and GzipFixed
classes overriding the incomplete and buggy bz2.BZ2File and gzip.GzipFile modules, and being wrapped
around io.TextIOWrapper().
........
r17712 | bugman | 2012-10-07 15:50:10 +0200 (Sun, 07 Oct 2012) | 11 lines
Reverted revisions r17702, r17701, r17693, r17687, r17685, r17684, and r17669.
The command used were:
svn merge -r17702:17669 relax_io.py
svn merge -r17702:r17701 /data/relax/relax-trunk/generic_fns/structure/internal.py
The relax_io module should now handle all files as text, independent of compression. These reverted
revisions were attempts at fixing the buggy behaviour of Python 3.0, 3.1 and 3.2. But now the
io.TextIOWrapper() class is being used to eliminate the byte streams, which should be text streams.
........
r17713 | bugman | 2012-10-07 15:56:44 +0200 (Sun, 07 Oct 2012) | 3 lines
The C module compilation testing script now accepts the Python version as a first argument.
........
r17714 | bugman | 2012-10-07 16:15:02 +0200 (Sun, 07 Oct 2012) | 6 lines
Reverted r17681 as file objects in relax are now always treated as text, so byte streams are not needed.
The command used was:
svn merge -r17681:r17680 .
........
r17715 | bugman | 2012-10-07 16:29:56 +0200 (Sun, 07 Oct 2012) | 5 lines
Python 3 fix for the Pipes.test_pipe_bundle() system test.
The order of bundle names returned by generic_fns.pipes.bundle_names() is not guaranteed in Python 3.
........
r17716 | bugman | 2012-10-07 16:38:01 +0200 (Sun, 07 Oct 2012) | 5 lines
For consistency between Python 2 and 3, the grace.write user function outputs to 15 decimal places.
This increased precision will only be of use in the relax test suite.
........
r17717 | bugman | 2012-10-07 16:38:43 +0200 (Sun, 07 Oct 2012) | 3 lines
Python 3 fix for the Noe.test_noe_analysis() system test for the grace.write precision changes.
........
r17718 | bugman | 2012-10-07 18:12:33 +0200 (Sun, 07 Oct 2012) | 8 lines
Python 3 fix for the relax_io.open_write_file() function.
This now matches the behaviour of open_read_file() in that there are three different behaviours for
opening bz2 and gz files for writing to for the different Python versions (one for Python 2, one for
Python 3.0 to 3.2, and one for Python 3.3+). All byte streams have been eliminated as
open_write_file() is for creating text files.
........
r17719 | bugman | 2012-10-07 18:45:38 +0200 (Sun, 07 Oct 2012) | 3 lines
Fix for the Relax_fit.test_bug_12670_12679() system test for the changes to Grace files at r17716.
........
r17720 | bugman | 2012-10-07 18:53:30 +0200 (Sun, 07 Oct 2012) | 3 lines
Python 3 fix - removed the use of the string module from generic_fns.spectrum.
........
r17721 | bugman | 2012-10-07 18:59:12 +0200 (Sun, 07 Oct 2012) | 6 lines
Removed the ability to save and restore states using the pickle module.
A pickled state is of no use to relax anymore. It's removal is needed for Python 3 support. So now
everything defaults to the XML formatted output.
........
r17722 | bugman | 2012-10-07 18:59:43 +0200 (Sun, 07 Oct 2012) | 3 lines
Eliminated the State.test_state_pickle() system test as pickled states are no longer supported.
........
r17723 | bugman | 2012-10-07 19:12:26 +0200 (Sun, 07 Oct 2012) | 3 lines
Removed the pickle format information and arguments from the state user function definitions.
........
r17724 | bugman | 2012-10-07 19:21:06 +0200 (Sun, 07 Oct 2012) | 6 lines
Python 3 support for Modelfree4 and Dasha.
The subprocess.Popen class works with byte arrays rather than strings in Python 3+. The Python
objects are now interconverted when the Python 3 encode() and decode() methods are detected.
........
r17725 | bugman | 2012-10-07 19:22:04 +0200 (Sun, 07 Oct 2012) | 3 lines
Small comment edit.
........
r17726 | bugman | 2012-10-07 20:56:21 +0200 (Sun, 07 Oct 2012) | 6 lines
Python 3 fix for the Mf.test_latex_table system test.
The latex_mf_table.py model-free system test script docstring contains backslashes, so the raw
string format r"""Text""" is now used.
........
r17727 | bugman | 2012-10-07 20:59:22 +0200 (Sun, 07 Oct 2012) | 3 lines
The OMP model-free results file generation script now outputs for any relax version.
........
r17728 | bugman | 2012-10-07 21:54:24 +0200 (Sun, 07 Oct 2012) | 6 lines
Removed the Python 3 byte array hack which should have been removed earlier.
This code is from r17669 which should have been removed at r17712 but was accidentally left out.
Instead of reverting, the code has been deleted as r17669 contained another useful change.
........
r17729 | bugman | 2012-10-07 21:58:58 +0200 (Sun, 07 Oct 2012) | 5 lines
Added a Python 3 version of the truncated OMP model-free results file.
This was created with trunk which is during the 2.1 relax releases.
........
r17730 | bugman | 2012-10-07 22:06:49 +0200 (Sun, 07 Oct 2012) | 6 lines
The messsage about skipping the GUI tests due to wxPython being missing is now more specific.
This was being shown for all runs of the test suite when it only needs to appear if GUI tests have
been run.
........
r17731 | bugman | 2012-10-07 22:11:43 +0200 (Sun, 07 Oct 2012) | 6 lines
The relaxation curve-fitting system tests are now skipped if the module is missing or broken.
This improves the printouts from the test suite and shows a summary of skipped tests rather than a
pile of traceback messages and errors.
........
r17732 | bugman | 2012-10-08 00:11:32 +0200 (Mon, 08 Oct 2012) | 7 lines
Python 3 fix for the model-free results file reading tests.
The ordering of dictionaries is different in Python 3, so now these are properly converted from
strings to dictionaries before comparison. This was not happening because of the XML changes from
Python 2.7.3 onwards.
........
r17733 | bugman | 2012-10-08 00:34:46 +0200 (Mon, 08 Oct 2012) | 5 lines
Python 3 fix for the setting of diffusion and alignment tensor simulation values.
The previous code somehow worked in Python 2 but was not formally correct and broke in Python 3.
........
r17734 | bugman | 2012-10-08 00:41:24 +0200 (Mon, 08 Oct 2012) | 5 lines
The fix of r17733 actually broke Python 2.
The list.__setattr__() method is fundamentally different between Python 2 and 3!
........
r17735 | bugman | 2012-10-08 00:47:19 +0200 (Mon, 08 Oct 2012) | 3 lines
Removed some debugging printouts accidentally committed in r17734.
........
r17736 | bugman | 2012-10-08 00:48:50 +0200 (Mon, 08 Oct 2012) | 5 lines
Fix for the fix of r17734 which attempted to fix r17733.
The Python version is now being detected.
........
r17737 | bugman | 2012-10-08 11:04:32 +0200 (Mon, 08 Oct 2012) | 6 lines
Updated the relax version numbers and 'trunk' used relax user manual.
For example the information about checking out the main development line was still talking about 1.3
rather than the trunk.
........
|
2012-10-16 09:03:18
|
Tree
|
[r17843]
by
bugman
Merged revisions 17689-17691 via svnmerge from
svn+ssh://bugman@.../svn/relax/trunk
........
r17689 | bugman | 2012-10-02 23:51:32 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 bug fix for the geometric structure module - another integer division to float problem.
........
r17690 | bugman | 2012-10-03 00:09:30 +0200 (Wed, 03 Oct 2012) | 3 lines
The Python 3 dictionary values() method no longer returns a list, so a list() call is needed.
........
r17691 | bugman | 2012-10-03 01:26:26 +0200 (Wed, 03 Oct 2012) | 6 lines
Bug fix for wxPython 2.9.4.0 - the unsetting of the alpha mask for all bitmap images should now work.
The wx.Bitmap.SetMaskColour(None) call does not work, so instead a wx.Colour() instance is passed in
instead.
........
|
2012-10-16 09:01:06
|
Tree
|
[r17842]
by
bugman
Merged revisions 17677-17687 via svnmerge from
svn+ssh://bugman@.../svn/relax/trunk
........
r17677 | bugman | 2012-10-02 16:35:26 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 integer division to float fix for the frame order analysis.
........
r17678 | bugman | 2012-10-02 16:54:57 +0200 (Tue, 02 Oct 2012) | 5 lines
Python 3 fix for the frame order system tests - float to string conversions behave differently.
Now the explicit %.1f formatting is used to force only a single decimal place float.
........
r17679 | bugman | 2012-10-02 16:58:40 +0200 (Tue, 02 Oct 2012) | 6 lines
Python 3 fix for the frame order system tests matching r17678.
As float to string conversions behave differently, the %.1f formatting is used to force only a
single decimal place float.
........
r17680 | bugman | 2012-10-02 16:59:22 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 fix - removed the use of the string.lower() function in the OpenDX mapping code.
........
r17681 | bugman | 2012-10-02 17:47:23 +0200 (Tue, 02 Oct 2012) | 6 lines
Python 3 fix for the writing out of XML formatted state and results files.
In Python 3, the xmldoc.toprettyxml() returns a string object which needs to be 'encoded' prior to
writing out to file.
........
r17682 | bugman | 2012-10-02 17:58:04 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 import fixes for the generic_fns.structure package using relative paths.
........
r17683 | bugman | 2012-10-02 18:29:25 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 fix for the format detection of results and save files.
........
r17684 | bugman | 2012-10-02 18:34:02 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 2 fix for the relax_io.extract_data() function for a bug introduced at r17669.
........
r17685 | bugman | 2012-10-02 18:46:16 +0200 (Tue, 02 Oct 2012) | 5 lines
The relax_io.DummyFileObject now mimics a file object for both Python 2 and 3.
In Python 3, everything from a file is of byte type and no longer string type.
........
r17686 | bugman | 2012-10-02 18:48:25 +0200 (Tue, 02 Oct 2012) | 6 lines
The Mf.test_write_results system test can now select the correct file to compare against in Python 3.
The algorithm for determining if the 'final_results_trunc_1.3_v2' or
'final_results_trunc_1.3_pre_py2.7.3_v2' file should be used could not handle Python 3.
........
r17687 | bugman | 2012-10-02 18:55:31 +0200 (Tue, 02 Oct 2012) | 5 lines
Another Python 3 fix for the relax_io.extract_data() function.
Sometimes this function sees byte types, sometimes string types. The function can now handle both.
........
|
2012-10-16 09:00:04
|
Tree
|
[r17841]
by
bugman
Merged revisions 17676 via svnmerge from
svn+ssh://bugman@.../svn/relax/trunk
........
r17676 | bugman | 2012-10-02 16:30:46 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 bug fix for the frame order analysis - another int division problem.
........
|
2012-10-16 08:58:09
|
Tree
|
[r17840]
by
bugman
Merged revisions 17671-17675 via svnmerge from
svn+ssh://bugman@.../svn/relax/trunk
........
r17671 | bugman | 2012-10-02 15:48:31 +0200 (Tue, 02 Oct 2012) | 5 lines
Python 3 fix for the user function docstring creation in the prompt UI mode.
Again this is the problem of a division now returning a float rather than an int.
........
r17672 | bugman | 2012-10-02 16:05:11 +0200 (Tue, 02 Oct 2012) | 5 lines
Python 3 fix for the test_write_protein_sequence() unit test.
This is again a string verses byte verses unicode problem.
........
r17673 | bugman | 2012-10-02 16:09:58 +0200 (Tue, 02 Oct 2012) | 5 lines
Python 3 bug fix for the Structure.test_read_pdb_mol_2_model_scientific system tests.
This is again an integer division problem returning a float.
........
r17674 | bugman | 2012-10-02 16:12:01 +0200 (Tue, 02 Oct 2012) | 5 lines
Python 2 and 3 support in the generic_fns.relax_data module using 2to3.
One print call was fixed after running 2to3.
........
r17675 | bugman | 2012-10-02 16:24:58 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 fixes - eliminated all usage of the dictionary has_key() calls as they are no longer present.
........
|
2012-10-16 08:56:13
|
Tree
|
[r17839]
by
bugman
Merged revisions 17661-17670 via svnmerge from
svn+ssh://bugman@.../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.
........
|
2012-10-16 08:52:33
|
Tree
|
[r17838]
by
bugman
Merged revisions 17651-17660 via svnmerge from
svn+ssh://bugman@.../svn/relax/trunk
........
r17651 | bugman | 2012-10-02 10:52:35 +0200 (Tue, 02 Oct 2012) | 5 lines
Created the check_types.is_unicode() function for Python 2+3 compatibility.
This is used in the generic_fns.mol_res_spin module.
........
r17652 | bugman | 2012-10-02 10:53:34 +0200 (Tue, 02 Oct 2012) | 3 lines
More usage of the is_unicode() function in the generic_fns.mol_res_spin module.
........
r17653 | bugman | 2012-10-02 10:54:58 +0200 (Tue, 02 Oct 2012) | 3 lines
Import fix for the OpenDX mapping package, recently broken with the relative import for Python 3 change.
........
r17654 | bugman | 2012-10-02 11:04:51 +0200 (Tue, 02 Oct 2012) | 3 lines
The compat module now has the py_version variable specifying if this is Python 2 or 3.
........
r17655 | bugman | 2012-10-02 11:39:17 +0200 (Tue, 02 Oct 2012) | 7 lines
For running relax with Python 2, the __builtin__.range() function has been replaced with xrange.
This causes large speed ups (speed that was lost with the earlier xrange() to range() conversions),
and memory decreases. For example on one system, the system test time decreased from 513.029s to
487.586s.
........
r17656 | bugman | 2012-10-02 11:47:15 +0200 (Tue, 02 Oct 2012) | 6 lines
Automatically converted the generic_fns.mol_res_spin module to support both Python 2 and 3.
The command used was:
2to3 -w generic_fns/mol_res_spin.py
........
r17657 | bugman | 2012-10-02 11:53:17 +0200 (Tue, 02 Oct 2012) | 5 lines
Python 3 fix for the generic_fns.mol_res_spin.parse_token() function.
Mixed lists for int and string can no longer be sorted. This sort call is not needed anyway.
........
r17658 | bugman | 2012-10-02 13:35:59 +0200 (Tue, 02 Oct 2012) | 3 lines
Fix for the test_parse_token_multi_element_name() unit test, as parse_token() no longer sorts.
........
r17659 | bugman | 2012-10-02 14:05:17 +0200 (Tue, 02 Oct 2012) | 6 lines
Fix for the running of the test suite under Python 3.
The zip() function used in the loadTestsFromTestCase() function is now an iterator, so it needs to
be passed through the list() function to generate a list.
........
r17660 | bugman | 2012-10-02 14:05:50 +0200 (Tue, 02 Oct 2012) | 3 lines
Copyright update.
........
|
2012-10-16 08:52:10
|
Tree
|
[r17837]
by
bugman
Merged revisions 17641-17650 via svnmerge from
svn+ssh://bugman@.../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.
........
|
2012-10-16 08:43:04
|
Tree
|
[r17836]
by
bugman
Merged revisions 17624-17640 via svnmerge from
svn+ssh://bugman@.../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.
........
|
2012-10-16 08:42:15
|
Tree
|
[r17835]
by
bugman
Merged revisions 17623 via svnmerge from
svn+ssh://bugman@.../svn/relax/trunk
........
r17623 | bugman | 2012-10-01 18:48:11 +0200 (Mon, 01 Oct 2012) | 5 lines
Python 3 preparations - removed all of the string module functions which no longer exist in Python 3.
These functions are part of the strings themselves now.
........
|
2012-10-16 08:40:17
|
Tree
|