[WIP] update python 3.0 for vsc-base

bin/logdaemon.py

@@ -91,9 +91,9 @@ def start(self):
 
         # get socket
         self.socket_.bind((self.hostname, self.port))
-        print "FANCYLOG_SERVER_PID=%s" % self.pidfile
-        print "FANCYLOG_SERVER=%s:%d" % (socket.gethostname(), self.socket_.getsockname()[-1])
-        print "FANCYLOG_SERVER_LOGFILE=%s" % self.logfile
+        print("FANCYLOG_SERVER_PID=%s" % self.pidfile)
+        print("FANCYLOG_SERVER=%s:%d" % (socket.gethostname(), self.socket_.getsockname()[-1]))
+        print("FANCYLOG_SERVER_LOGFILE=%s" % self.logfile)
         sys.stdout.flush()
 
         # Start the daemon

lib/vsc/utils/affinity.py

@@ -294,33 +294,33 @@ def setpriority(prio, which=None, who=None):
     setLogLevelDebug()
 
     cs = cpu_set_t()
-    print "__bits", cs.__bits
-    print "sizeof cpu_set_t", ctypes.sizeof(cs)
+    print("__bits", cs.__bits)
+    print("sizeof cpu_set_t", ctypes.sizeof(cs))
     x = sched_getaffinity()
-    print "x", x
+    print("x", x)
     hr_mask = "1-5,7,9,10-15"
-    print hr_mask, x.convert_hr_bits(hr_mask)
-    print x
+    print(hr_mask, x.convert_hr_bits(hr_mask))
+    print(x)
     x.set_bits()
-    print x
+    print(x)
 
     sched_setaffinity(x)
-    print sched_getaffinity()
+    print(sched_getaffinity())
 
     x.convert_hr_bits("1")
     x.set_bits()
     sched_setaffinity(x)
     y = sched_getaffinity()
-    print x, y
+    print(x, y)
 
-    print sched_getcpu()
+    print(sched_getcpu())
 
     # resources
     # nice -n 5 python affinity.py prints 5 here
     currentprio = getpriority()
-    print "getpriority", currentprio
+    print("getpriority", currentprio)
     newprio = 10
     setpriority(newprio)
     newcurrentprio = getpriority()
-    print "getpriority", newcurrentprio
+    print("getpriority", newcurrentprio)
     assert newcurrentprio == newprio

lib/vsc/utils/asyncprocess.py

@@ -109,7 +109,7 @@ def send(self, inp):
 
         try:
             written = os.write(self.stdin.fileno(), inp)
-        except OSError, why:
+        except OSError as why:
             if why[0] == errno.EPIPE:  # broken pipe
                 return self._close('stdin')
             raise

lib/vsc/utils/daemon.py

@@ -37,7 +37,7 @@ def daemonize(self):
             if pid > 0:
                 # exit first parent
                 sys.exit(0)
-        except OSError, e:
+        except OSError as e:
             sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror))
             sys.exit(1)
 
@@ -52,7 +52,7 @@ def daemonize(self):
             if pid > 0:
                 # exit from second parent
                 sys.exit(0)
-        except OSError, e:
+        except OSError as e:
             sys.stderr.write("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror))
             sys.exit(1)
 
@@ -117,13 +117,13 @@ def stop(self):
             while 1:
                 os.kill(pid, SIGTERM)
                 time.sleep(0.1)
-        except OSError, err:
+        except OSError as err:
             err = str(err)
             if err.find("No such process") > 0:
                 if os.path.exists(self.pidfile):
                     os.remove(self.pidfile)
             else:
-                print str(err)
+                print(str(err))
                 sys.exit(1)
 
     def restart(self):

lib/vsc/utils/dateandtime.py

@@ -138,7 +138,7 @@ def number(self, otherdate):
     def get_other(self, shift=-1):
         """Return month that is shifted shift months: negative integer is in past, positive is in future"""
         new = self.date.year * 12 + self.date.month - 1 + shift
-        return self.__class__(date(new // 12, new % 12 + 1, 01))
+        return self.__class__(date(new // 12, new % 12 + 1, 1))
 
     def interval(self, otherdate):
         """Return time ordered list of months between date and otherdate"""

lib/vsc/utils/docs.py

@@ -43,7 +43,7 @@ def mk_rst_table(titles, columns):
     title_cnt, col_cnt = len(titles), len(columns)
     if title_cnt != col_cnt:
         msg = "Number of titles/columns should be equal, found %d titles and %d columns" % (title_cnt, col_cnt)
-        raise LengthNotEqualException, msg
+        raise LengthNotEqualException(msg)
     table = []
     tmpl = []
     line= []

lib/vsc/utils/fancylogger.py

@@ -187,10 +187,12 @@ def _env_to_boolean(varname, default=False):
 APOCALYPTIC = 'APOCALYPTIC'
 # register new loglevelname
 logging.addLevelName(logging.CRITICAL * 2 + 1, APOCALYPTIC)
+
 # register QUIET, EXCEPTION and FATAL alias
-logging._levelNames['EXCEPTION'] = logging.ERROR
-logging._levelNames['FATAL'] = logging.CRITICAL
-logging._levelNames['QUIET'] = logging.WARNING
+if hasattr(logging,'_levelNames'):
+    logging._levelNames['EXCEPTION'] = logging.ERROR
+    logging._levelNames['FATAL'] = logging.CRITICAL
+    logging._levelNames['QUIET'] = logging.WARNING
 
 
 # mpi rank support
@@ -326,7 +328,7 @@ def raiseException(self, message, exception=None, catch=False):
             exception = self.RAISE_EXCEPTION_CLASS
 
         self.RAISE_EXCEPTION_LOG_METHOD(fullmessage)
-        raise exception, message, tb
+        raise exception(message)
 
     # pylint: disable=unused-argument
     def deprecated(self, msg, cur_ver, max_ver, depth=2, exception=None, log_callback=None, *args, **kwargs):
@@ -477,12 +479,12 @@ def getLogger(name=None, fname=False, clsname=False, fancyrecord=None):
     l = logging.getLogger(fullname)
     l.fancyrecord = fancyrecord
     if _env_to_boolean('FANCYLOGGER_GETLOGGER_DEBUG'):
-        print 'FANCYLOGGER_GETLOGGER_DEBUG',
-        print 'name', name, 'fname', fname, 'fullname', fullname,
-        print "getRootLoggerName: ", getRootLoggerName()
+        print('FANCYLOGGER_GETLOGGER_DEBUG'),
+        print('name', name, 'fname', fname, 'fullname', fullname),
+        print("getRootLoggerName: ", getRootLoggerName())
         if hasattr(l, 'get_parent_info'):
-            print 'parent_info verbose'
-            print "\n".join(l.get_parent_info("FANCYLOGGER_GETLOGGER_DEBUG"))
+            print('parent_info verbose')
+            print("\n".join(l.get_parent_info("FANCYLOGGER_GETLOGGER_DEBUG")))
         sys.stdout.flush()
     return l
 
@@ -585,7 +587,7 @@ def logToFile(filename, enable=True, filehandler=None, name=None, max_bytes=MAX_
             os.makedirs(directory)
         except Exception as ex:
             exc, detail, tb = sys.exc_info()
-            raise exc, "Cannot create logdirectory %s: %s \n detail: %s" % (directory, ex, detail), tb
+            raise exc("Cannot create logdirectory %s: %s \n detail: %s" % (directory, ex, detail))
 
     return _logToSomething(
         logging.handlers.RotatingFileHandler,
@@ -745,8 +747,8 @@ def setLogLevel(level):
 
     logger.setLevel(level)
     if _env_to_boolean('FANCYLOGGER_LOGLEVEL_DEBUG'):
-        print "FANCYLOGGER_LOGLEVEL_DEBUG", level, logging.getLevelName(level)
-        print "\n".join(logger.get_parent_info("FANCYLOGGER_LOGLEVEL_DEBUG"))
+        print("FANCYLOGGER_LOGLEVEL_DEBUG", level, logging.getLevelName(level))
+        print("\n".join(logger.get_parent_info("FANCYLOGGER_LOGLEVEL_DEBUG")))
         sys.stdout.flush()
 
 
@@ -865,8 +867,8 @@ class FancyRootLogger(FancyLogger, logging.RootLogger):
             lgr[1].parent = root
 
     if _env_to_boolean('FANCYLOGGER_LOGLEVEL_DEBUG'):
-        print "FANCYLOGGER_LOGLEVEL_DEBUG SETROOT ", lvl, logging.getLevelName(lvl)
-        print "\n".join(root.get_parent_info("FANCYLOGGER_LOGLEVEL_DEBUG SETROOT "))
+        print("FANCYLOGGER_LOGLEVEL_DEBUG SETROOT ", lvl, logging.getLevelName(lvl))
+        print("\n".join(root.get_parent_info("FANCYLOGGER_LOGLEVEL_DEBUG SETROOT ")))
         sys.stdout.flush()
 
     # silence the root logger

lib/vsc/utils/generaloption.py

@@ -346,7 +346,7 @@ def _process_long_opt(self, rargs, values):
         """Extend optparse code with catch of unknown long options error"""
         try:
             OptionParser._process_long_opt(self, rargs, values)
-        except BadOptionError, err:
+        except BadOptionError as err:
             self.largs.append(err.opt_str)
 
     def _process_short_opts(self, rargs, values):
@@ -1252,7 +1252,7 @@ def parseoptions(self, options_list=None):
 
         try:
             (self.options, self.args) = self.parser.parse_args(options_list)
-        except SystemExit, err:
+        except SystemExit as err:
             self.log.debug("parseoptions: parse_args err %s code %s" % (err, err.code))
             if self.no_system_exit:
                 return

lib/vsc/utils/mail.py

@@ -96,30 +96,30 @@ def _send(self,
                 s.connect()
             try:
                 s.sendmail(mail_from, mail_to, msg.as_string())
-            except smtplib.SMTPHeloError, err:
+            except smtplib.SMTPHeloError as err:
                 self.log.error("Cannot get a proper response from the SMTP host" +
                                (self.mail_host and " %s" % (self.mail_host) or ""))
                 raise
-            except smtplib.SMTPRecipientsRefused, err:
+            except smtplib.SMTPRecipientsRefused as err:
                 self.log.error("All recipients were refused by SMTP host" +
                                (self.mail_host and " %s" % (self.mail_host) or "") +
                                " [%s]" % (mail_to))
                 raise
-            except smtplib.SMTPSenderRefused, err:
+            except smtplib.SMTPSenderRefused as err:
                 self.log.error("Sender was refused by SMTP host" +
                                (self.mail_host and " %s" % (self.mail_host) or "") +
                                "%s" % (mail_from))
                 raise
-            except smtplib.SMTPDataError, err:
+            except smtplib.SMTPDataError as err:
                 raise
-        except smtplib.SMTPConnectError, err:
+        except smtplib.SMTPConnectError as err:
             self.log.exception("Cannot connect to the SMTP host" + (self.mail_host and " %s" % (self.mail_host) or ""))
             raise VscMailError(mail_host=self.mail_host,
                                mail_to=mail_to,
                                mail_from=mail_from,
                                mail_subject=mail_subject,
                                err=err)
-        except Exception, err:
+        except Exception as err:
             self.log.exception("Some unknown exception occurred in VscMail.sendTextMail. Raising a VscMailError.")
             raise VscMailError(mail_host=self.mail_host,
                                mail_to=mail_to,

lib/vsc/utils/missing.py

@@ -262,7 +262,7 @@ def __getitem__(self, key, *args, **kwargs):
         """Redefine __getitem__ to provide a better KeyError message."""
         try:
             return super(FrozenDictKnownKeys, self).__getitem__(key, *args, **kwargs)
-        except KeyError, err:
+        except KeyError as err:
             if key in self.KNOWN_KEYS:
                 raise KeyError(err)
             else:
@@ -293,12 +293,12 @@ def get_class_for(modulepath, class_name):
     # try to import specified module path, reraise ImportError if it occurs
     try:
         module = __import__(modulepath, globals(), locals(), [''])
-    except ImportError, err:
+    except ImportError as err:
         raise ImportError(err)
     # try to import specified class name from specified module path, throw ImportError if this fails
     try:
         klass = getattr(module, class_name)
-    except AttributeError, err:
+    except AttributeError as err:
         raise ImportError("Failed to import %s from %s: %s" % (class_name, modulepath, err))
     return klass
 
@@ -335,7 +335,7 @@ def new_function(*args, **kwargs):
             for i in xrange(0, self.n):
                 try:
                     return function(*args, **kwargs)
-                except self.exceptions, err:
+                except self.exceptions as err:
                     if i == self.n - 1:
                         raise
                     _log.exception("try_or_fail caught an exception - attempt %d: %s" % (i, err))

lib/vsc/utils/optcomplete.py

@@ -544,7 +544,7 @@ def autocomplete(parser, arg_completer=None, opt_completer=None, subcmd_complete
     if isinstance(completions, basestring):
         # is a bash command, just run it
         if SHELL in (BASH,):  # TODO: zsh
-            print completions
+            print(completions)
         else:
             raise Exception("Commands are unsupported by this shell %s" % SHELL)
     else:
@@ -555,9 +555,9 @@ def autocomplete(parser, arg_completer=None, opt_completer=None, subcmd_complete
 
         # Save results
         if SHELL == "bash":
-            print 'COMPREPLY=(' + completions + ')'
+            print('COMPREPLY=(' + completions + ')')
         else:
-            print completions
+            print(completions)
 
     # Print debug output (if needed).  You can keep a shell with 'tail -f' to
     # the log file to monitor what is happening.

lib/vsc/utils/run.py

@@ -63,6 +63,11 @@
 @author: Stijn De Weirdt (Ghent University)
 """
 
+try:
+    basestring
+except:
+    basestring = str
+
 import errno
 import logging
 import os

test/dateandtime.py

@@ -110,8 +110,8 @@ def suite():
     today = datetime.date.today()
     endapril = datetime.date(today.year, 4, 10)
     f = FancyMonth(endapril)
-    print f.nrdays, 30  # nr days in month
+    print(f.nrdays, 30)  # nr days in month
 
     may2nd = datetime.date(today.year, 5, 2)
-    print f.number(may2nd), 2  # spans 2 months
-    print [x.nrdays for x in f.interval(may2nd)], [30, 31]  # interval returns FancyMonth instances
+    print(f.number(may2nd), 2)  # spans 2 months
+    print([x.nrdays for x in f.interval(may2nd)], [30, 31])  # interval returns FancyMonth instances

test/fancylogger.py

@@ -412,7 +412,7 @@ def somefunction(self):
         handler = fancylogger.logToScreen()
         logger = fancylogger.getLogger(fname=False, clsname=False)
         logger.warn("blabla")
-        print stringfile.getvalue()
+        print(stringfile.getvalue())
         # this will only hold in debug mode, so also disable the test
         if __debug__:
             self.assertTrue('FancyLoggerTest' in stringfile.getvalue())

test/generaloption.py

@@ -787,7 +787,7 @@ def test_error_env_options(self):
                          msg='no errors logged, got %s' % self.count_logcache('error'))
 
         topt1 = TestOption1(go_args=['--level-level'], envvar_prefix='GENERALOPTIONTEST', error_env_options=True)
-        print self.LOGCACHE['error']
+        print(self.LOGCACHE['error'])
         self.assertEqual(self.count_logcache('error'), 1,
                          msg='one error should be logged, got %s' % self.count_logcache('error'))
 

test/missing.py

@@ -115,7 +115,7 @@ def generate_random_dag():
     """
     myseed = randint(0, sys.maxint)
     seed(myseed)
-    print "testing with random seed", myseed
+    print("testing with random seed", myseed)
     edge_probability = randint(10, 30)
     ranks = randint(3, 10)
     graph = {}

test/optcomplete.py

@@ -81,7 +81,7 @@ def _call(self, **kwargs):
         # missing mandatory CALL_ARGS
         try:
             nc()
-        except Exception, e:
+        except Exception as e:
             pass
 
         self.assertEqual(e.__class__, CompleterMissingCallArgument)