r26512 - in /trunk: devel_scripts/ sample_scripts/n_state_model/ scons/ -- November 11, 2014 - 10:43

Author: bugman
Date: Tue Nov 11 10:43:30 2014
New Revision: 26512

URL: http://svn.gna.org/viewcvs/relax?rev=26512&view=rev
Log:
Python 3 fixes via 2to3 - replacement of all `x` with repr(x).

The command used was:
2to3 -j 4 -w -f repr .


Modified:
    trunk/devel_scripts/log_converter.py
    trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
    trunk/scons/install.py

Modified: trunk/devel_scripts/log_converter.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/devel_scripts/log_converter.py?rev=26512&r1=26511&r2=26512&view=diff
==============================================================================
--- trunk/devel_scripts/log_converter.py        (original)
+++ trunk/devel_scripts/log_converter.py        Tue Nov 11 10:43:30 2014
@@ -18,7 +18,7 @@
 
 # Test that the argument is a file.
 if not access(sys.argv[1], F_OK):
-    sys.stderr.write(`sys.argv[1]` + " is not accessible as a file.\n")
+    sys.stderr.write(repr(sys.argv[1]) + " is not accessible as a file.\n")
     sys.exit()
 
 # Open the file, read the lines, then close it.

Modified: trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/n_state_model/conformation_analysis_rdc%2Bpcs.py?rev=26512&r1=26511&r2=26512&view=diff
==============================================================================
--- trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py 
(original)
+++ trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py Tue 
Nov 11 10:43:30 2014
@@ -112,7 +112,7 @@
 # Load all the tag structures.
 NUM_TAG = 1000
 for i in range(NUM_TAG):
-    structure.read_pdb(file='LactoseMCMM4_'+`i+1`, 
dir=pardir+sep+pardir+sep+pardir+sep+'structures'+sep+'tag_1000'+sep+'080704_MCMM4_aligned-forEd1000',
 set_model_num=i+1, set_mol_name='tag')
+    structure.read_pdb(file='LactoseMCMM4_'+repr(i+1), 
dir=pardir+sep+pardir+sep+pardir+sep+'structures'+sep+'tag_1000'+sep+'080704_MCMM4_aligned-forEd1000',
 set_model_num=i+1, set_mol_name='tag')
 
 # Load the lanthanide atoms.
 structure.load_spins(spin_id=':4@C1', ave_pos=False)

Modified: trunk/scons/install.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/scons/install.py?rev=26512&r1=26511&r2=26512&view=diff
==============================================================================
--- trunk/scons/install.py      (original)
+++ trunk/scons/install.py      Tue Nov 11 10:43:30 2014
@@ -112,7 +112,7 @@
 
     # Run relax to create the *.pyc files.
     print("\nCreating the byte-compiled *.pyc files.")
-    python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + 
`sys.version_info[0]` + '.' + `sys.version_info[1]`
+    python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + 
repr(sys.version_info[0]) + '.' + repr(sys.version_info[1])
     cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % 
(env['RELAX_PATH'], python_path, python_path)
     print(cmd)
     system(cmd)