Merge branch 'release/0.7.2'

Author: dan-blanchard

README.rst

@@ -39,6 +39,11 @@ License
 Changelog
 ~~~~~~~~~
 
+-  v0.7.2
+   
+   -  Fix a couple inconsistencies with ``str`` vs ``bytes`` in Python 3 in 
+      ``drmaa.session``.
+
 -  v0.7.1
 
    -  Add `Read The Docs documentation <http://drmaa-python.readthedocs.org>`__

drmaa/helpers.py

@@ -45,11 +45,6 @@
                             drmaa_set_attribute, drmaa_set_vector_attribute,
                             drmaa_version, STRING)
 
-# Python 3 compatability help
-if sys.version_info < (3, 0):
-    bytes = str
-    str = unicode
-
 
 _BUFLEN = ATTR_BUFFER
 
@@ -59,10 +54,10 @@ class BoolConverter(object):
     """Helper class to convert to/from bool attributes."""
 
     def __init__(self, true=b'y', false=b'n'):
-        if isinstance(true, str):
+        if not isinstance(true, bytes):
             true = true.encode()
         self.true = true
-        if isinstance(false, str):
+        if not isinstance(false, bytes):
             false = false.encode()
         self.false = false
 
@@ -137,15 +132,15 @@ def __init__(self, name, type_converter=None):
            a converter to translate attribute values to/from the underlying
            implementation. See BoolConverter for an example.
         """
-        if isinstance(name, str):
+        if not isinstance(name, bytes):
             name = name.encode()
         self.name = name
         self.converter = type_converter
 
     def __set__(self, instance, value):
         if self.converter:
             v = self.converter.to_drmaa(value)
-        elif isinstance(value, str):
+        elif not isinstance(value, bytes):
             v = value.encode()
         else:
             v = value
@@ -172,7 +167,7 @@ class VectorAttribute(object):
     """
 
     def __init__(self, name):
-        if isinstance(name, str):
+        if not isinstance(name, bytes):
             name = name.encode()
         self.name = name
 
@@ -193,7 +188,7 @@ class DictAttribute(object):
     """
 
     def __init__(self, name):
-        if isinstance(name, str):
+        if not isinstance(name, bytes):
             name = name.encode()
         self.name = name
 

drmaa/session.py

@@ -368,7 +368,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 not isinstance(jobId, bytes):
+            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 +453,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 not isinstance(jobId, bytes):
+            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 +501,9 @@ def jobStatus(jobId):
         jobs return a FAILED status.
         """
         status = c_int()
-        c(drmaa_job_ps, jobId.encode(), byref(status))
+        if not isinstance(jobId, bytes):
+            jobId = jobId.encode()        
+        c(drmaa_job_ps, jobId, byref(status))
         return status_to_string(status.value)
 
     def __enter__(self):

drmaa/version.py

@@ -22,5 +22,5 @@
 :author: Dan Blanchard ([email protected])
 '''
 
-__version__ = '0.7.1'
+__version__ = '0.7.2'
 VERSION = tuple(int(x) for x in __version__.split('.'))