diff options
| -rw-r--r-- | aptsources/distro.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/aptsources/distro.py b/aptsources/distro.py index 82fd67ba..1c9daa27 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -163,7 +163,7 @@ class Distribution(object): fname = "/usr/share/xml/iso-codes/iso_3166.xml" if os.path.exists(fname): et = ElementTree(file=fname) - it = et.getiterator('iso_3166_entry') + it = et.iter('iso_3166_entry') for elm in it: try: descr = elm.attrib["common_name"] diff --git a/debian/changelog b/debian/changelog index cce0d623..cad5c31c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ python-apt (0.8.8ubuntu5) UNRELEASED; urgency=low * tests/test_auth.py: In test_add_key_from_server_mitm(), show the exception if it does not match the expectation, so that this becomes possible to debug. + * aptsources/distro.py: Replace the deprecated getiterator() ElementTree + method with iter(), to avoid raising a PendingDeprecationWarning. -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 20 Nov 2012 09:43:36 +0100 |