r19909 - in /branches/relax_disp/specific_analyses/relax_disp: cpmgfit.py sherekhan.py -- June 06, 2013 - 19:59

Author: bugman
Date: Thu Jun  6 19:59:02 2013
New Revision: 19909

URL: http://svn.gna.org/viewcvs/relax?rev=19909&view=rev
Log:
Python 3 fixes for the modules of the specific_analyses.relax_disp package.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py
    branches/relax_disp/specific_analyses/relax_disp/sherekhan.py

Modified: branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py?rev=19909&r1=19908&r2=19909&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py Thu Jun  6 
19:59:02 2013
@@ -28,7 +28,7 @@
 # Python module imports.
 from math import pi
 from os import F_OK, access, chmod, sep
-from string import lower
+from stat import S_IEXEC
 PIPE, Popen = None, None
 if dep_check.subprocess_module:
     from subprocess import PIPE, Popen
@@ -75,7 +75,7 @@
 
     # The directory.
     if dir == None:
-        dir = lower(cdp.model)
+        dir = cdp.model.lower()
     if not access(dir, F_OK):
         raise RelaxDirError('CPMGFit', dir)
 
@@ -152,7 +152,7 @@
 
     # Directory creation.
     if dir == None:
-        dir = lower(cdp.model)
+        dir = cdp.model.lower()
     mkdir_nofail(dir, verbosity=0)
 
     # The 'run.sh' script.
@@ -172,7 +172,7 @@
 
     # Close the batch script, then make it executable.
     batch.close()
-    chmod(dir + sep + 'batch_run.sh', 0755)
+    chmod(dir + sep + 'batch_run.sh', S_IEXEC)
 
 
 def create_spin_input(function=None, spin=None, spin_id=None, dir=None):

Modified: branches/relax_disp/specific_analyses/relax_disp/sherekhan.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/sherekhan.py?rev=19909&r1=19908&r2=19909&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/sherekhan.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/sherekhan.py Thu Jun  6 
19:59:02 2013
@@ -28,7 +28,6 @@
 # Python module imports.
 from math import pi
 from os import F_OK, access, chmod, sep
-from string import lower
 PIPE, Popen = None, None
 if dep_check.subprocess_module:
     from subprocess import PIPE, Popen