Merge pull request #1 from EducationalTestingService/master

Python 3 compatibility and version 0.6 bump

Author: davidr

README.md

@@ -1,4 +1,4 @@
 # drmaa-python
 
-DRMAA bindings for Python
+DRMAA bindings for Python. Now Python 3 compatible.
 

drmaa/__init__.py

@@ -30,9 +30,9 @@
 import ctypes as _ct
 
 try:
-    import namedtuple as _nt
+    from collections import namedtuple
 except ImportError: # pre 2.6 behaviour
-    import nt as _nt
+    from drmaa.nt import namedtuple
 
 __version__ = "$Revision$"[11:-2]
 
@@ -68,10 +68,10 @@
                           OutOfMemoryException,)
 
 Version = _h.Version
-JobInfo = _nt.namedtuple("JobInfo",
+JobInfo = namedtuple("JobInfo",
                          """jobId hasExited hasSignal terminatedSignal
                             hasCoreDump wasAborted exitStatus resourceUsage""")
-# FileTransferMode = _nt.namedtuple("FileTransferMode",
+# FileTransferMode = namedtuple("FileTransferMode",
 #                                   """transferInputStream transferOutputStream
 #                                      transferErrorStream""")
 
@@ -359,7 +359,7 @@ def runBulkJobs(jobTemplate, beginIndex, endIndex, step):
     @staticmethod
     def control(jobId, operation):
         """\
-Used to hold, release, suspend, resume, or kill the job identified by jobId.  
+Used to hold, release, suspend, resume, or kill the job identified by jobId.
 
 :Parameters:
   jobId : string
@@ -429,7 +429,7 @@ def synchronize(jobIds, timeout=-1, dispose=False):
 timeout has elapsed, all the jobs have been waited on or there was an
 interrupt. If the invocation exits on timeout, an ExitTimeoutException
 is thrown. The caller should check system time before and after this
-call in order to be sure of how much time has passed.  
+call in order to be sure of how much time has passed.
 """
         if dispose: d = 1
         else: d = 0
@@ -439,7 +439,7 @@ def synchronize(jobIds, timeout=-1, dispose=False):
     @staticmethod
     def wait(jobId, timeout=-1):
         """\
-Wait for a job with jobId to finish execution or fail. 
+Wait for a job with jobId to finish execution or fail.
 
 :Parameters:
   `jobId` : str
@@ -449,7 +449,7 @@ def wait(jobId, timeout=-1):
     jobId, this routine will wait for any job from the session
   `timeout` : float
     The timeout value is used to specify the desired behavior when a
-    result is not immediately available. 
+    result is not immediately available.
 
     The value `Session.TIMEOUT_WAIT_FOREVER` may be specified to wait
     indefinitely for a result. The value `Session.TIMEOUT_NO_WAIT` may

drmaa/helpers.py

@@ -29,9 +29,9 @@
 _BUFLEN=const.ATTR_BUFFER
 
 try:
-    import namedtuple as _nt
+    from collections import namedtuple
 except ImportError: # pre 2.6 behaviour
-    import nt as _nt
+    from drmaa.nt import namedtuple
 
 class BoolConverter(object):
     """Helper class to convert to/from bool attributes."""
@@ -66,7 +66,7 @@ def __get__(self, *args):
         c(self._f, buf, _ct.sizeof(buf))
         return buf.value
 
-Version = _nt.namedtuple("Version", "major minor")
+Version = namedtuple("Version", "major minor")
 Version.__str__ = lambda x: "%s.%s" % (x.major, x.minor)
 #Version.__doc__ = """\
 #An object representing the DRMAA version.
@@ -105,7 +105,7 @@ def __set__(self, instance, value):
         c(drmaa_set_attribute, instance, self.name, v)
     def __get__(self, instance, _):
         attr_buffer = create_string_buffer(const.ATTR_BUFFER)
-        c(drmaa_get_attribute, instance, self.name, 
+        c(drmaa_get_attribute, instance, self.name,
           attr_buffer, sizeof(attr_buffer))
         if self.converter:
             return self.converter.from_drmaa(attr_buffer.value)
@@ -114,7 +114,7 @@ def __get__(self, instance, _):
 
 class VectorAttribute(object):
     """\
-A DRMAA attribute representing a list. 
+A DRMAA attribute representing a list.
 
 To be managed with vector C DRMAA attribute management functions."""
     def __init__(self, name):
@@ -133,7 +133,7 @@ class DictAttribute(object):
     def __init__(self, name):
         self.name = name
     def __set__(self, instance, value):
-        v = [ "%s=%s" % (k, v) for (k, v) in value.iteritems() ]
+        v = [ "%s=%s" % (k, v) for (k, v) in value.items() ]
         c(drmaa_set_vector_attribute, instance, self.name, string_vector(v))
     def __get__(self, instance, _):
         x = [ i.split('=', 1) for i in list(vector_attribute_iterator(

setup.py

@@ -1,21 +1,21 @@
 # -----------------------------------------------------------
-#  Copyright (C) 2009 StatPro Italia s.r.l. 
-#                                                            
-#  StatPro Italia                                            
-#  Via G. B. Vico 4                                          
-#  I-20123 Milano                                            
-#  ITALY                                                     
-#                                                            
-#  phone: +39 02 96875 1                                     
-#  fax:   +39 02 96875 605                                   
-#                                                            
-#  This program is distributed in the hope that it will be   
-#  useful, but WITHOUT ANY WARRANTY; without even the        
-#  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR   
-#  PURPOSE. See the license for more details.                
+#  Copyright (C) 2009 StatPro Italia s.r.l.
+#
+#  StatPro Italia
+#  Via G. B. Vico 4
+#  I-20123 Milano
+#  ITALY
+#
+#  phone: +39 02 96875 1
+#  fax:   +39 02 96875 605
+#
+#  This program is distributed in the hope that it will be
+#  useful, but WITHOUT ANY WARRANTY; without even the
+#  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#  PURPOSE. See the license for more details.
 # -----------------------------------------------------------
-#  
-#  Author: Enrico Sirola <enrico.sirola@statpro.com> 
+#
+#  Author: Enrico Sirola <enrico.sirola@statpro.com>
 
 from setuptools import setup, find_packages
 
@@ -24,7 +24,7 @@
 
 setup(
     name="drmaa",
-    version="0.5",
+    version="0.6",
     packages=packages,
     package_data=package_data,
     author="Enrico Sirola",
@@ -44,8 +44,9 @@
 Intended Audience :: Science/Research
 License :: OSI Approved :: BSD License
 Programming Language :: Python :: 2
+Programming Language :: Python :: 3
 Topic :: Software Development :: Libraries :: Python Modules
 Topic :: System :: Distributed Computing""".split('\n'),
 )
-    
+