diff --git a/tangostationcontrol/tangostationcontrol/devices/antennafield.py b/tangostationcontrol/tangostationcontrol/devices/antennafield.py index 6479abf92dcb35c3bd0092eb57740da4514b5453..e3289b9b7df79719cfdf56e3508a66bcaeb869db 100644 --- a/tangostationcontrol/tangostationcontrol/devices/antennafield.py +++ b/tangostationcontrol/tangostationcontrol/devices/antennafield.py @@ -16,7 +16,6 @@ from tango import DeviceProxy, DevSource, AttrWriteType, DevVarFloatArray, DevVa from tango.server import device_property, attribute, command # Additional import -from tangostationcontrol.common.type_checking import sequence_not_str from tangostationcontrol.common.type_checking import type_not_sequence from tangostationcontrol.common.entrypoint import entry from tangostationcontrol.devices.lofar_device import lofar_device diff --git a/tangostationcontrol/tangostationcontrol/test/common/test_type_checking.py b/tangostationcontrol/tangostationcontrol/test/common/test_type_checking.py index 051001fc8a7e7f4e7f9050ec40365c2afe8e15de..253fb6182006a426188e84576bf295344f973549 100644 --- a/tangostationcontrol/tangostationcontrol/test/common/test_type_checking.py +++ b/tangostationcontrol/tangostationcontrol/test/common/test_type_checking.py @@ -35,8 +35,8 @@ class TestTypeChecking(base.TestCase): """Test object is sequence based on properties and verify is_sequence""" result = ( - self.subscriptable(obj) & self.iterable(obj) & - self.positional_ordering(obj) + self.subscriptable(obj) & self.iterable(obj) + & self.positional_ordering(obj) ) self.assertEqual( @@ -73,5 +73,5 @@ class TestTypeChecking(base.TestCase): def test_type_not_sequence(self): test = [str] - self.asserFalse(type_checking.type_not_sequence(test)) - self.asserTrue(type_checking.type_not_sequence(test[0])) + self.assertFalse(type_checking.type_not_sequence(test)) + self.assertTrue(type_checking.type_not_sequence(test[0])) diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py index 465db52aa16855a727ff06467c1f25e9965dfd0d..23e08c71bb07db68319b8795d90cfcacc0846810 100644 --- a/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py +++ b/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py @@ -7,8 +7,6 @@ # Distributed under the terms of the APACHE license. # See LICENSE.txt for more info. -import time -import statistics import logging import unittest