Merge pull request #285 from rtburns-jpl/python39

Remove use of deprecated XML ElementTree getchildren method

Author: rtburns-jpl

.circleci/config.yml

@@ -53,6 +53,10 @@ jobs:
             topsApp.py --help --steps
             stripmapApp.py --help --steps
             python3 -c "import isce"
+            # Create dummy ref/secondary configs for topsApp
+            ln -s ../examples/input_files/reference_TOPS_SENTINEL1.xml reference.xml
+            ln -s reference.xml secondary.xml
+            topsApp.py --steps --end=preprocess ../examples/input_files/topsApp.xml
 
   test:
     docker:

components/isceobj/Catalog/Catalog.py

@@ -246,7 +246,7 @@ def renderXml(self, file=None, nodeTag=None, elementTag=None):
 def dict_to_xml(adict,file,nodeTag=None,elementTag=None):
     a = ET.Element(nodeTag)  # something to hang nodes on
     a = dict_to_et(a,adict,nodeTag,elementTag)
-    et = a.getchildren()[0]
+    et = list(a)[0]
     indent(et)
     tree = ET.ElementTree(et)
     tree.write(file)

components/isceobj/Sensor/CEOS.py

@@ -44,7 +44,7 @@ def __init__(self, xml=None, dataFile=None):
         self.metadata = {}
         if not  xml == None:
             self.xmlFP = open(self.xml, 'r')
-            self.rootChildren = ET(file=self.xmlFP).getroot().getchildren()
+            self.rootChildren = list(ET(file=self.xmlFP).getroot())
         else:
             self.xmlFP = None
             self.rootChildren = []
@@ -81,7 +81,7 @@ def parseFast(self):
                 self.metadata[key] = [None]*loopCount
                 for i in range(loopCount):
                     struct = {}
-                    for node in z.getchildren():
+                    for node in z:
                         (subkey,data) = self.decodeNode(node)
                         struct[subkey] = data
                     self.metadata[key][i] = struct
@@ -98,7 +98,7 @@ def parse(self):
         xmlFP = open(self.xml, 'r')
 
         self.root = ET(file=xmlFP).getroot()
-        for z in self.root.getchildren():
+        for z in self.root:
             # If the tag name is 'rec', this is a plain old record
             if z.tag == 'rec':
                 (key,data) = self.decodeNode(z)
@@ -116,7 +116,7 @@ def parse(self):
                 self.metadata[key] = [None]*loopCount
                 for i in range(loopCount):
                     struct = {}
-                    for node in z.getchildren():
+                    for node in z:
                         (subkey,data) = self.decodeNode(node)
                         struct[subkey] = data
                     self.metadata[key][i] = struct

components/isceobj/Sensor/GRD/Radarsat2.py

@@ -276,8 +276,8 @@ def populateBbox(self, margin=0.1):
         glist = (self.getxmlelement('imageAttributes/geographicInformation/geolocationGrid'))
         lat = []
         lon = []
-        for child in glist.getchildren():
-            for grandchild in child.getchildren():
+        for child in glist:
+            for grandchild in child:
                 string = ElementTree.tostring(grandchild, encoding = 'unicode', method = 'xml')
                 string = string.split("<")[1]
                 string = string.split(">")[0]
@@ -303,7 +303,7 @@ def getOrbitFromXML(self):
             if node.tag == 'stateVector':
                 sv = StateVector()
                 sv.configure()
-                for z in node.getchildren():
+                for z in node:
                     if z.tag == 'timeStamp':
                         timeStamp = self.convertToDateTime(z.text)
                     elif z.tag == 'xPosition':
@@ -346,16 +346,16 @@ def readGCPsFromXML(self):
             if not node.tag == 'imageTiePoint':
                 continue
 
-            for z in node.getchildren():
+            for z in node:
                 if z.tag == 'imageCoordinate':
-                    for zz in z.getchildren():
+                    for zz in z:
                         if zz.tag == 'line':
                             line = float(zz.text)
                         elif zz.tag == 'pixel':
                             pixel = float(zz.text)
 
                 if z.tag == 'geodeticCoordinate':
-                    for zz in z.getchildren():
+                    for zz in z:
                         if zz.tag == 'latitude':
                             lat = float(zz.text)
                         elif zz.tag == 'longitude':
@@ -424,8 +424,8 @@ def extractgr2sr(self):
         lines = []
         data = []
 
-        for child in node.getchildren():
-            for child in node.getchildren():
+        for child in node:
+            for child in node:
                 string = ElementTree.tostring(child, encoding = 'unicode', method = 'xml')
                 string = string.split("<")[1]
                 string = string.split(">")[0]

components/isceobj/Sensor/GRD/Sentinel1.py

@@ -406,7 +406,7 @@ def populateBbox(self, margin=0.1):
         lat = []
         lon = []
 
-        for child in glist.getchildren():
+        for child in glist:
             lat.append( float(child.find('latitude').text))
             lon.append( float(child.find('longitude').text))
 
@@ -502,7 +502,7 @@ def extractOrbit(self):
         frameOrbit = Orbit()
         frameOrbit.configure()
 
-        for child in node.getchildren():
+        for child in node:
             timestamp = self.convertToDateTime(child.find('time').text)
             pos = []
             vel = []
@@ -543,7 +543,7 @@ def extractPreciseOrbit(self):
         tstart = self.product.sensingStart - margin
         tend = self.product.sensingStop + margin
 
-        for child in node.getchildren():
+        for child in node:
             timestamp = self.convertToDateTime(child.find('UTC').text[4:])
 
             if (timestamp >= tstart) and (timestamp < tend):
@@ -606,7 +606,7 @@ def extractBetaLUT(self):
         pixels = []
         data = None
 
-        for ii, child in enumerate(node.getchildren()):
+        for ii, child in enumerate(node):
             pixnode = child.find('pixel')
             nump = int(pixnode.attrib['count'])
 
@@ -685,7 +685,7 @@ def extractNoiseLUT(self):
         noise_range_lut_indices = np.zeros((num_vectors,))
         noise_range_lut_values = np.zeros((num_vectors, self.product.numberOfSamples))
 
-        for ii, child in enumerate(node.getchildren()):
+        for ii, child in enumerate(node):
             print("Processing range noise vector {}/{}".format(ii + 1, num_vectors))
             pixnode = child.find('pixel')
 
@@ -711,7 +711,7 @@ def extractNoiseLUT(self):
             noise_azimuth_lut_indices = defaultdict(list)
             noise_azimuth_lut_values = defaultdict(list)
 
-            for block_i, child in enumerate(node.getchildren()):
+            for block_i, child in enumerate(node):
                 print("Processing azimuth noise vector {}/{}".format(block_i + 1, num_vectors))
                 linenode = child.find('line')
                 signode = child.find("noiseAzimuthLut")
@@ -861,7 +861,7 @@ def extractSlantRange(self, full=True):
         data = []
 
 
-        for ii, child in enumerate(node.getchildren()):
+        for ii, child in enumerate(node):
             t0 = self.convertToDateTime(child.find('azimuthTime').text)
 
             lines.append( (t0-self.product.sensingStart).total_seconds()/self.product.azimuthTimeInterval)

components/isceobj/Sensor/GRD/Terrasarx.py

@@ -325,8 +325,8 @@ def populateBbox(self, margin=0.1):
         glist = (self.getxmlelement(self._xml2_root, 'geolocationGrid'))
         lat = []
         lon = []
-        for child in glist.getchildren():
-            for grandchild in child.getchildren():
+        for child in glist:
+            for grandchild in child:
                 string = ElementTree.tostring(child, encoding = 'unicode', method = 'xml')
                 string = string.split("<")[1]
                 string = string.split(">")[0]
@@ -352,7 +352,7 @@ def getOrbitFromXML(self):
             if node.tag == 'stateVec':
                 sv = StateVector()
                 sv.configure()
-                for z in node.getchildren():
+                for z in node:
                     if z.tag == 'timeUTC':
                         timeStamp = self.convertToDateTime2(z.text)
                     elif z.tag == 'posX':
@@ -396,7 +396,7 @@ def readGCPsFromXML(self):
             if not node.tag == 'gridPoint':
                 continue
 
-            for zz in node.getchildren():
+            for zz in node:
                 if zz.tag == 't':
                     az_time = float(zz.text)
                 elif zz.tag == 'tau':
@@ -429,9 +429,9 @@ def extractlutSigma(self):
             if not node.tag == 'antennaPattern':
                 continue
 
-            for z in node.getchildren():
+            for z in node:
                 if z.tag == 'elevationPattern':
-                    for zz in z.getchildren():
+                    for zz in z:
                         if zz.tag == 'gainExt':
                             node = float(zz.text)
                             node2.append(node)
@@ -467,9 +467,9 @@ def extractgr2sr(self):
         for node in self._xml_root.find('productSpecific'):
             if not node.tag == 'projectedImageInfo':
                 continue
-            for z in node.getchildren():
+            for z in node:
                 if z.tag == 'slantToGroundRangeProjection':
-                    for zz in z.getchildren():
+                    for zz in z:
                         if zz.tag == 'coefficient':
                             p = float(zz.text)*(SPEED_OF_LIGHT)
                             pp.append(p)