mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-09 20:45:47 +01:00
Code

Merge pull request #1189 from dmach/et-getiterator-iter

Browse Source 
Replace deprecated ElementTree.Element.getiterator() with iter()
This commit is contained in:
Daniel Mach 2022-11-07 09:53:50 +01:00 committed by GitHub
commit a53852eca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc/core.py
View File

@ -7249,7 +7249,7 @@ def addPerson(apiurl, prj, pac, user, role="maintainer"):
if data and get_user_meta(apiurl, user) is not None: if data and get_user_meta(apiurl, user) is not None:
root = ET.fromstring(parse_meta_to_string(data)) root = ET.fromstring(parse_meta_to_string(data))
found = False found = False
for person in root.getiterator('person'): for person in root.iter('person'):
if person.get('userid') == user and person.get('role') == role: if person.get('userid') == user and person.get('role') == role:
found = True found = True
print("user already exists") print("user already exists")
@ -7284,7 +7284,7 @@ def delPerson(apiurl, prj, pac, user, role="maintainer"):
if data and get_user_meta(apiurl, user) is not None: if data and get_user_meta(apiurl, user) is not None:
root = ET.fromstring(parse_meta_to_string(data)) root = ET.fromstring(parse_meta_to_string(data))
found = False found = False
for person in root.getiterator('person'): for person in root.iter('person'):
if person.get('userid') == user and person.get('role') == role: if person.get('userid') == user and person.get('role') == role:
root.remove(person) root.remove(person)
found = True found = True
@ -7315,10 +7315,10 @@ def setBugowner(apiurl, prj, pac, user=None, group=None):
user = None user = None
if data: if data:
root = ET.fromstring(parse_meta_to_string(data)) root = ET.fromstring(parse_meta_to_string(data))
for group_element in root.getiterator('group'): for group_element in root.iter('group'):
if group_element.get('role') == "bugowner": if group_element.get('role') == "bugowner":
root.remove(group_element) root.remove(group_element)
for person_element in root.getiterator('person'): for person_element in root.iter('person'):
if person_element.get('role') == "bugowner": if person_element.get('role') == "bugowner":
root.remove(person_element) root.remove(person_element)
if user: if user: