Skip to content

Commit 030f067

Browse files
authored
Fix AttributeError on Python 3.9 due to usage of removed API in xml (#492)
* Fix usage of deprecated method on ElementTree or Element These are covered by tests. * Two more getchildren to just iteration (not covered by tests)
1 parent 77cb194 commit 030f067

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

enable/savage/compliance/viewer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def addElementToTree(self, element, node):
6868
node = self.AppendItem(node, txt)
6969
self.SetPyData(node, element)
7070
#children
71-
for child in element.getchildren():
71+
for child in element:
7272
self.addElementToTree(child, node)
7373
#attributes
7474
for key, value in element.items():

enable/savage/svg/document.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def findIDs(self, element, uri=''):
302302
attribute it may be given.
303303
"""
304304
idmap = {}
305-
for e in element.getiterator():
305+
for e in element.iter():
306306
id = e.get('id', None)
307307
if id is not None:
308308
idmap[(uri, id)] = e
@@ -468,7 +468,7 @@ def addGroupToDocument(self, node):
468468
path = self.renderer.makePath()
469469
ops.extend(self.createTransformOpsFromNode(node))
470470
ops.extend(self.createTransformOpsFromXY(node))
471-
for child in node.getchildren():
471+
for child in node:
472472
cpath, cops = self.processElement(child)
473473
if cpath:
474474
path.AddPath(cpath)
@@ -653,7 +653,7 @@ def addRectToDocument(self, node, path):
653653
clip_path = self.renderer.makePath()
654654
ops.extend(self.createTransformOpsFromNode(element))
655655
ops.extend(self.generatePathOps(clip_path))
656-
for child in element.getchildren():
656+
for child in element:
657657
cpath, cops = self.processElement(child)
658658
if cpath:
659659
clip_path.AddPath(cpath)

kiva/tests/test_svg_drawing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def draw_and_check(self):
1717
filename = "{0}.svg".format(self.filename)
1818
self.gc.save(filename)
1919
tree = ElementTree.parse(filename)
20-
elements = [element for element in tree.getiterator()]
20+
elements = [element for element in tree.iter()]
2121
if not len(elements) in [4, 7]:
2222
self.fail('The expected number of elements was not found')
2323

0 commit comments

Comments
 (0)