From 9b42df1d06a3057b601f0f02f901b720cffa3c1e Mon Sep 17 00:00:00 2001
From: Mattia Mancini <mancini@astron.nl>
Date: Fri, 26 Apr 2019 14:25:25 +0000
Subject: [PATCH] Story SW-678: fix python3 compatibility issues.
---
LCU/checkhardware/check_hardware.py | 6 ++++++
LCU/checkhardware/checkhardware_lib/data.py | 2 +-
LCU/checkhardware/checkhardware_lib/general.py | 4 ++--
LCU/checkhardware/checkhardware_lib/lofar.py | 2 +-
.../checkhardware_lib/spectrum_checks/peakslib.py | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/LCU/checkhardware/check_hardware.py b/LCU/checkhardware/check_hardware.py
index 2507149d9d2..3296f0d5644 100755
--- a/LCU/checkhardware/check_hardware.py
+++ b/LCU/checkhardware/check_hardware.py
@@ -136,6 +136,12 @@ from checkhardware_lib import CoreStations
from checkhardware_lib import RemoteStations
from checkhardware_lib import LBA
from checkhardware_lib import remove_all_data_files
+from checkhardware_lib import SPU
+from checkhardware_lib import TBB
+from checkhardware_lib import activate_test_mode
+
+
+
check_version = '0516'
diff --git a/LCU/checkhardware/checkhardware_lib/data.py b/LCU/checkhardware/checkhardware_lib/data.py
index ae24efe2ecb..7e8d8d08ec9 100644
--- a/LCU/checkhardware/checkhardware_lib/data.py
+++ b/LCU/checkhardware/checkhardware_lib/data.py
@@ -351,7 +351,7 @@ class AntennaData:
if freq_band in list(self.bands.keys()):
band = freq_band
- if isinstance(sb_set, int):
+ if isinstance(sb_set, int) or isinstance(sb_set, np.integer):
if sb_set in sb_range:
sb = sb_set
else:
diff --git a/LCU/checkhardware/checkhardware_lib/general.py b/LCU/checkhardware/checkhardware_lib/general.py
index 1e2121019a0..600cdc89bdd 100644
--- a/LCU/checkhardware/checkhardware_lib/general.py
+++ b/LCU/checkhardware/checkhardware_lib/general.py
@@ -49,9 +49,9 @@ def run_cmd(cmd=''):
cmdline = Popen(cmd_list, stdout=PIPE, stderr=PIPE)
(so, se) = cmdline.communicate()
if len(so) != 0:
- return so
+ return so.decode('UTF-8')
else:
- return 'Error, %s' % se
+ return 'Error, %s' % se.decode('UTF-8')
except:
logger.error('Caught %s', str(sys.exc_info()[0]))
logger.error(str(sys.exc_info()[1]))
diff --git a/LCU/checkhardware/checkhardware_lib/lofar.py b/LCU/checkhardware/checkhardware_lib/lofar.py
index 93091d0526a..92d3e6bdd69 100644
--- a/LCU/checkhardware/checkhardware_lib/lofar.py
+++ b/LCU/checkhardware/checkhardware_lib/lofar.py
@@ -127,7 +127,7 @@ def read_station_config():
nhba = int(val)
continue
if key == "RS.HBA_SPLIT":
- if string.upper(val) == "YES":
+ if str.upper(val) == "YES":
hba_split = 1
continue
return st_id, nrsp, ntbb, nlbl, nlbh, nhba, hba_split
diff --git a/LCU/checkhardware/checkhardware_lib/spectrum_checks/peakslib.py b/LCU/checkhardware/checkhardware_lib/spectrum_checks/peakslib.py
index b359238eae2..697a525ad2c 100644
--- a/LCU/checkhardware/checkhardware_lib/spectrum_checks/peakslib.py
+++ b/LCU/checkhardware/checkhardware_lib/spectrum_checks/peakslib.py
@@ -2,7 +2,7 @@
from numpy import ma, fft, power, arange, isscalar, NaN, Inf, zeros
from sys import exit
import logging
-from lofar.lcu.checkhardware.checkhardware_lib.data import *
+from checkhardware_lib.data import *
logger = logging.getLogger('main.chk.pea..')
logger.debug("init logger")
--
GitLab