From 2c97a83256ed4958cb8956bd405b247ec6f738d5 Mon Sep 17 00:00:00 2001
From: Mattia Mancini <mancini@astron.nl>
Date: Fri, 8 Jun 2018 10:27:10 +0000
Subject: [PATCH] Story SW-300: Fixing python3 compatibility
---
LCU/Maintenance/MDB_tools/cli/mdb_loader.py | 13 ++++++-------
LCU/Maintenance/MDB_tools/test/t_mdb_loader.py | 5 +++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/LCU/Maintenance/MDB_tools/cli/mdb_loader.py b/LCU/Maintenance/MDB_tools/cli/mdb_loader.py
index 9b6b674be93..dfa2494f37c 100755
--- a/LCU/Maintenance/MDB_tools/cli/mdb_loader.py
+++ b/LCU/Maintenance/MDB_tools/cli/mdb_loader.py
@@ -1,15 +1,14 @@
#! /usr/bin/env python
-import logging
import argparse
-import requests
+import logging
+import re
import sys
-import json
from glob import glob
-import os
-import re
+from os.path import isfile
+import requests
-logger = logging.getLogger('probe_mdb')
+logger = logging.getLogger('mdb_loader')
"""
This program is meant to load the station tests and RTSM present in a certain directory to the database
@@ -36,7 +35,7 @@ def obtain_file_list(path):
:return:
"""
logger.info('listing file in %s', path)
- file_list = filter(os.path.isfile, glob(path))
+ file_list = list(filter(isfile, glob(path)))
logger.debug('found files: %s', file_list)
return file_list
diff --git a/LCU/Maintenance/MDB_tools/test/t_mdb_loader.py b/LCU/Maintenance/MDB_tools/test/t_mdb_loader.py
index d1cad4d8135..c2e03cc28ff 100644
--- a/LCU/Maintenance/MDB_tools/test/t_mdb_loader.py
+++ b/LCU/Maintenance/MDB_tools/test/t_mdb_loader.py
@@ -1,5 +1,7 @@
import unittest
+
from mock import patch, MagicMock, Mock
+
from lofar.maintenance.utils.cli.mdb_loader import *
logger = logging.getLogger(__name__)
@@ -78,13 +80,12 @@ class TESTMDBLoader(unittest.TestCase):
with self.assertRaises(ValueError):
create_query_string(is_station_test=False, is_rtsm=False)
- @patch('os.path.isfile')
+ @patch('lofar.maintenance.utils.cli.mdb_loader.isfile')
@patch('lofar.maintenance.utils.cli.mdb_loader.glob')
def test_obtain_file_path_list(self, glob_mock, isfile_mock):
path = 'test'
glob_return_values = ['test', 'test1', 'test2']
glob_mock.return_value = glob_return_values
-
obtain_file_list(path)
glob_mock.assert_called_with(path)
self.assertEqual(isfile_mock.call_count, 3)
--
GitLab