Commit ebeaefc4 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Fix #868, replaced `.getchildren()` with `list()`

parent 3eacc926
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -197,8 +197,7 @@ class PyCalmuxImpl(CalMux, cc, services, lcycle):
            raise exc

        try:
            children = ElementTree.fromstring(dao).getchildren()
            for child in children:
            for child in list(ElementTree.fromstring(dao)):
                backend, channel, polarity = [c.text.strip() for c in child]
                backend = backend.lower()
                value = (int(channel), int(polarity))
+2 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ class CDBConf(object):
        try:
            dal = ACSCorba.cdb()
            dao = dal.get_DAO(path)
            children = ElementTree.fromstring(dao).getchildren()
            children = list(ElementTree.fromstring(dao))
        except cdbErrType.CDBRecordDoesNotExistEx:
            raeson = "CDB record %s does not exists" %path
            logger.logError(raeson)
@@ -218,7 +218,7 @@ class CDBConf(object):
            exc.setReason(raeson)
            raise exc
        except Exception as ex:
            children = () 
            children = []

        setattr(self, dictName, {})
        d = getattr(self, dictName)
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ class TestProcedures(unittest.TestCase):
    def setUp(self):
        dal = ACSCorba.cdb()
        dao = dal.get_DAO('alma/Procedures/StationProcedures')
        self.procedures = ElementTree.fromstring(dao).getchildren()
        self.procedures = list(ElementTree.fromstring(dao))

    def test_reset_not_allowed_in_setup(self):
        """Vefify the setup does not execute the antennaReset command"""
+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ class SRTIFDistributor14Impl(SRTIFDistributor14, cc, services, lcycle):
            raise exc

        try:
            children = ElementTree.fromstring(dao).getchildren()
            for child in children:
            for child in list(ElementTree.fromstring(dao))
                backend, channel, address = [c.text.strip() for c in child]
                value = {int(channel): int(address)}
                if backend in self.mapping: