removed use of find_executable()

Author: denisri

python/soma_workflow/gui/workflowGui.py

@@ -4,9 +4,6 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-from __future__ import with_statement, print_function
-from __future__ import absolute_import
-
 import time
 import threading
 import os
@@ -18,6 +15,7 @@
 from soma_workflow import connection
 import sys
 import traceback
+import shutil
 # import cProfile
 # import pdb
 
@@ -3931,9 +3929,8 @@ def graph_visibility_changed(self, visible):
     def printWorkflow(self):
 
         import tempfile
-        from distutils.spawn import find_executable
 
-        if not find_executable("dot"):
+        if not shutil.which("dot"):
             print("Unable to print workflow because dot executable is not",
                   "available.", file = sys.stderr)
             return None

python/soma_workflow/schedulers/pbspro_scheduler.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import with_statement, print_function
-from __future__ import absolute_import
-
 '''
 organization: I2BM, Neurospin, Gif-sur-Yvette, France
 
@@ -14,16 +11,14 @@
 import logging
 import os
 import socket
-import six
 import json
 import soma_workflow.constants as constants
 from soma_workflow.errors import DRMError, ExitTimeoutException
 from soma_workflow import configuration
-from soma_workflow.configuration import Configuration
 import tempfile
 from soma_workflow import subprocess
 import time
-import distutils.spawn
+import shutil
 
 
 class JobTemplate(object):
@@ -59,7 +54,7 @@ def build_pbs_script(self, script_file=None):
                 f.write('#PBS -q %s\n' % self.queue)
             # if self.env:
                 # var = ','.join(['"%s=%s"' % (k, v.replace('"', '\\"'))
-                                # for k, v in six.iteritems(self.env)])
+                                # for k, v in self.env.items()])
                 # f.write('#PBS -v %s\n' % var)
             if self.nativeSpecification:
                 native_spec = self.nativeSpecification
@@ -186,7 +181,7 @@ def out_of_container_command():
                                 None)
         if out_container is not None:
             return out_container  # cached
-        if distutils.spawn.find_executable('qstat') \
+        if shutil.which('qstat') \
                 or 'CASA_HOST_DIR' not in os.environ:
             out_container = []
         else:
@@ -708,7 +703,7 @@ def get_job_exit_info(self, scheduler_job_id):
 
             self.logger.info("  ==> res_status=" + repr(res_status))
             res_resourceUsage = u''
-            for k, v in six.iteritems(resource_usage):
+            for k, v in resource_usage.items():
                 res_resourceUsage = res_resourceUsage + \
                     k + u'=' + str(v) + u' '