Added more support for Python3

Author: MarcCote

smartdispatch/argument_template.py

@@ -35,7 +35,7 @@ def unfold(self, match):
         start = int(groups[0])
         end = int(groups[1])
         step = 1 if groups[2] is None else int(groups[2])
-        return map(str, range(start, end, step))
+        return list(map(str, range(start, end, step)))
 
 
 argument_templates = build_argument_templates_dictionnary()

smartdispatch/smartdispatch.py

@@ -96,7 +96,7 @@ def unfold_command(command):
         pos = match.end()
 
     arguments.append([text[pos:]])  # Add remaining unfolded arguments
-    arguments = [map(utils.decode_escaped_characters, argvalues) for argvalues in arguments]
+    arguments = [list(map(utils.decode_escaped_characters, argvalues)) for argvalues in arguments]
     return ["".join(argvalues) for argvalues in itertools.product(*arguments)]
 
 

smartdispatch/tests/test_job_generator.py

@@ -22,7 +22,7 @@ def setUp(self):
         self.mem_per_node = 32
         self.modules = ["cuda", "python"]
 
-        self.queue = Queue(self.name, self.cluster_name, self.walltime, self.cores, 0, self.modules)
+        self.queue = Queue(self.name, self.cluster_name, self.walltime, self.cores, 0, self.mem_per_node, self.modules)
         self.queue_gpu = Queue(self.name, self.cluster_name, self.walltime, self.cores, self.gpus, self.mem_per_node, self.modules)
 
     def tearDown(self):

smartdispatch/tests/test_smartdispatch.py

@@ -3,7 +3,11 @@
 import shutil
 import time as t
 from os.path import join as pjoin
-from StringIO import StringIO
+
+try:
+    from io import StringIO  # Python 3
+except ImportError:
+    from StringIO import StringIO  # Python 2
 
 import tempfile
 from nose.tools import assert_true, assert_equal

smartdispatch/tests/test_utils.py

@@ -74,7 +74,7 @@ def test_open_with_lock():
         time.sleep(1)
 
     stdout, stderr = process.communicate()
-    assert_equal(stdout, "")
+    assert_equal(stdout, b"")
     assert_true("write-lock" in stderr, msg="Forcing a race condition, try increasing sleeping time above.")
     assert_true("Traceback" not in stderr, msg="Unexpected error: " + stderr)  # Check that there are no errors.