[med-svn] [Git][med-team/ctdopts][master] 2 commits: do not use getchildren

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ctdopts


Commits:
1ade716b by Andreas Tille at 2020-11-02T21:06:09+01:00
do not use getchildren

- - - - -
5174a893 by Andreas Tille at 2020-11-02T21:07:13+01:00
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/bc082bd2e20c81fdf33cf96f8241f6cce68f2f8d.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+ctdopts (1.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * do not use getchildren (thanks for the patch to Michael Hudson-Doyle)
+    Closes: #972528
+
+ -- Andreas Tille <tille at debian.org>  Mon, 02 Nov 2020 21:06:31 +0100
+
 ctdopts (1.4-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/bc082bd2e20c81fdf33cf96f8241f6cce68f2f8d.patch
=====================================
@@ -0,0 +1,25 @@
+From bc082bd2e20c81fdf33cf96f8241f6cce68f2f8d Mon Sep 17 00:00:00 2001
+From: Michael Hudson-Doyle <michael.hudson at canonical.com>
+Date: Tue, 20 Oct 2020 12:44:24 +1300
+Subject: [PATCH] do not use getchildren, removed in python 3.9
+
+---
+ CTDopts/CTDopts.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CTDopts/CTDopts.py b/CTDopts/CTDopts.py
+index e8970e1..c941811 100644
+--- a/CTDopts/CTDopts.py
++++ b/CTDopts/CTDopts.py
+@@ -1222,8 +1222,9 @@ def get_args(element, base=None):
+             if 'value' in element.attrib:
+                 base[element.attrib['name']] = element.attrib['value']
+         elif element.tag == 'ITEMLIST':
+-            if element.getchildren():
+-                base[element.attrib['name']] = [listitem.attrib['value'] for listitem in element]
++            items = list(element)
++            if items:
++                base[element.attrib['name']] = [listitem.attrib['value'] for listitem in items]
+ 
+     root = parse(filename).getroot()
+     param_root = root if root.tag == 'PARAMETERS' else root.find('PARAMETERS')


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 2to3
+bc082bd2e20c81fdf33cf96f8241f6cce68f2f8d.patch



View it on GitLab: https://salsa.debian.org/med-team/ctdopts/-/compare/c260af4983e0786f93f010730e50274552f982a3...5174a893e165d3c986b04d9aa96f7856ad99c207

-- 
View it on GitLab: https://salsa.debian.org/med-team/ctdopts/-/compare/c260af4983e0786f93f010730e50274552f982a3...5174a893e165d3c986b04d9aa96f7856ad99c207
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201102/cbbab55c/attachment-0001.html>