From 643d05c0c55343c538dbf18359f93dcbbe28134b Mon Sep 17 00:00:00 2001
From: Auke Klazema <klazema@astron.nl>
Date: Tue, 2 Apr 2019 15:02:23 +0000
Subject: [PATCH] SW-609: Fix Configparser and print issues
---
LCS/MessageDaemons/src/MessageRouter | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/LCS/MessageDaemons/src/MessageRouter b/LCS/MessageDaemons/src/MessageRouter
index d58e63d6789..d3701b47b01 100644
--- a/LCS/MessageDaemons/src/MessageRouter
+++ b/LCS/MessageDaemons/src/MessageRouter
@@ -27,13 +27,13 @@ import lofar.messagebus.messagebus as messagebus
import lofar.messagebus.message as message
import threading
-from ConfigParser import SafeConfigParser
+from configparser import ConfigParser
import os.path
import sys
from datetime import datetime
def log(level, msg):
- print "%s %-4s %s" % (str(datetime.now())[:-3], level, msg)
+ print("%s %-4s %s" % (str(datetime.now())[:-3], level, msg))
class BusMulticast(threading.Thread):
"""
@@ -66,7 +66,7 @@ class BusMulticast(threading.Thread):
try:
content = msg.content()
log("INFO","[%s] [%s] Message received" % (self.source, content))
- except Exception, e:
+ except Exception as e:
content = "<unknown>"
log("WARN","[%s] Non-compliant message received" % (self.source,))
@@ -78,7 +78,7 @@ class BusMulticast(threading.Thread):
log("INFO", "[%s] [%s] Forwarded to %s" % (self.source, content, self.destlist))
- except Exception, e:
+ except Exception as e:
log("FATAL", "[%s] Caught exception: %s" % (self.source, e))
# Abort everything, to avoid half-broken situations
@@ -87,7 +87,7 @@ class BusMulticast(threading.Thread):
log("INFO", "[%s] Done" % (self.source,))
-class RouterConfig(SafeConfigParser):
+class RouterConfig(ConfigParser):
"""
Router configuration. Example:
@@ -99,7 +99,7 @@ class RouterConfig(SafeConfigParser):
and allow multiple source: dest lines to accumulate.
"""
def __init__(self, filename=None):
- SafeConfigParser.__init__(self)
+ ConfigParser.__init__(self)
# set defaults
self.add_section('multicast')
@@ -114,7 +114,7 @@ class RouterConfig(SafeConfigParser):
return False
log("INFO","[RouterConfig] Reading %s" % (filename,))
- SafeConfigParser.read(self, filename)
+ ConfigParser.read(self, filename)
return True
def sources(self):
--
GitLab