More clean up

clusterlib/scheduler.py

@@ -25,6 +25,7 @@
 
 
 def _sge_queued_or_running_jobs(user=None):
+    """Get queued or running jobs from SGE queue system"""
     command = "qstat -xml"
     if user is not None:
         command += " -u {}".format(user)
@@ -40,6 +41,7 @@ def _sge_queued_or_running_jobs(user=None):
 
 
 def _slurm_queued_or_running_jobs(user=None):
+    """Get queued or running jobs from SLURM queue system"""
     command = "squeue --noheader -o %j"
     if user is not None:
         command += " -u {}".format(user)

clusterlib/tests/test_scheduler.py

@@ -18,15 +18,6 @@
 from ..scheduler import submit
 
 
-if sys.version_info[0] == 2:
-    bytes = str
-    str = unicode
-
-elif sys.version_info[0] == 3:
-    str = str
-    bytes = bytes
-
-
 def test_queued_or_running_jobs_slurm():
     """Test queued or running job function on slurm"""
 
@@ -60,6 +51,13 @@ def test_queued_or_running_jobs_slurm():
         try:
             running_jobs = queued_or_running_jobs(user=user)
             if sys.version_info[0] == 3:
+                # the bytes should be decoded before, right after you read them
+                # (e.g. from a socket or a file). In Python 2 is done
+                # implicitly with a random (platform specific) encoding.
+                # In Python 3 youhave to decode bytes objects into unicode
+                # string explicitly with an appropriate encoding depending on
+                # where the bytes come from.
+
                 running_jobs = [s.decode("utf8") for s in running_jobs]
 
             assert_in(job_name, running_jobs)