Fix a few remaining cases in session.py where .encode() was being called for bytes.

Author: dan-blanchard

drmaa/session.py

@@ -55,6 +55,12 @@
                         wasAborted exitStatus resourceUsage""")
 
 
+# Python 3 compatability help
+if sys.version_info < (3, 0):
+    bytes = str
+    str = unicode
+
+
 class JobTemplate(object):
 
     """A job to be submitted to the DRM."""
@@ -368,7 +374,9 @@ def control(jobId, operation):
         jobs submitted by other DRMAA session in other DRMAA implementations
         or jobs submitted via native utilities.
         """
-        c(drmaa_control, jobId.encode(), string_to_control_action(operation))
+        if isinstance(jobId, str):
+            jobId = jobId.encode()        
+        c(drmaa_control, jobId, string_to_control_action(operation))
 
     # takes string list, num value and boolean, no return value
     @staticmethod
@@ -451,8 +459,10 @@ def wait(jobId, timeout=-1):
         stat = c_int()
         jid_out = create_string_buffer(128)
         rusage = pointer(POINTER(drmaa_attr_values_t)())
-        c(drmaa_wait, jobId.encode(), jid_out, sizeof(jid_out), byref(stat),
-          timeout, rusage)
+        if isinstance(jobId, str):
+            jobId = jobId.encode()                
+        c(drmaa_wait, jobId, jid_out, sizeof(jid_out), byref(stat), timeout, 
+          rusage)
         res_usage = adapt_rusage(rusage)
         exited = c_int()
         c(drmaa_wifexited, byref(exited), stat)
@@ -497,7 +507,9 @@ def jobStatus(jobId):
         jobs return a FAILED status.
         """
         status = c_int()
-        c(drmaa_job_ps, jobId.encode(), byref(status))
+        if isinstance(jobId, str):
+            jobId = jobId.encode()        
+        c(drmaa_job_ps, jobId, byref(status))
         return status_to_string(status.value)
 
     def __enter__(self):