Merge branch 'py3' into 'master'

Improve py3 compatibility

See merge request !7

gridtk/models.py

@@ -323,7 +323,7 @@ class Job(Base):
       grid_opt = self.get_arguments()
       if grid_opt:
         # add additional information about the job at the end
-        command_line = "<" + ",".join(["%s=%s" % (key,value) for key,value in grid_opt.iteritems()]) + ">: " + command_line
+        command_line = "<" + ",".join(["%s=%s" % (key,value) for key,value in grid_opt.items()]) + ">: " + command_line
       if self.exec_dir is not None:
         command_line += "; [Executed in directory: '%s']" % self.exec_dir
 

gridtk/tests/__init__.py

@@ -225,6 +225,7 @@ class GridTKTest(unittest.TestCase):
       print()
       # test that the list command still works
       jman.main([self.jman, '--database', self.database, 'list', '--print-array-jobs'])
+      jman.main([self.jman, '--database', self.database, 'list', '--long', '--print-array-jobs'])
 
       print()
       # test that the report command works