jenkins-bot merged this change.

View Change

Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified
[IMPR] Remove deprecated getchildren() usage

Bug: T213814
Change-Id: I4a2c8a6d72173bc0856d7abccd573a6c265004dc
---
M scripts/flickrripper.py
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py
index fe50dcf..248050e 100755
--- a/scripts/flickrripper.py
+++ b/scripts/flickrripper.py
@@ -358,10 +358,10 @@
pages = photos.find('photos').attrib['pages']

def gen(i):
- return flickr.groups_pools_getPhotos(
+ return list(flickr.groups_pools_getPhotos(
group_id=group_id, user_id=user_id, tags=tags,
per_page='100', page=i
- ).find('photos').getchildren()
+ ).find('photos'))
# https://www.flickr.com/services/api/flickr.photosets.getPhotos.html
# Get the photos in a photoset
elif photoset_id:
@@ -370,9 +370,9 @@
pages = photos.find('photoset').attrib['pages']

def gen(i):
- return flickr.photosets_getPhotos(
+ return list(flickr.photosets_getPhotos(
photoset_id=photoset_id, per_page='100', page=i
- ).find('photoset').getchildren()
+ ).find('photoset'))
# https://www.flickr.com/services/api/flickr.people.getPublicPhotos.html
# Get the (public) photos uploaded by a user
elif user_id:
@@ -381,9 +381,9 @@
pages = photos.find('photos').attrib['pages']

def gen(i):
- return flickr.people_getPublicPhotos(
+ return list(flickr.people_getPublicPhotos(
user_id=user_id, per_page='100', page=i
- ).find('photos').getchildren()
+ ).find('photos'))
for i in range(1, int(pages) + 1):
gotPhotos = False
while not gotPhotos:

To view, visit change 557519. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a2c8a6d72173bc0856d7abccd573a6c265004dc
Gerrit-Change-Number: 557519
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki@aol.com>
Gerrit-Reviewer: Dvorapa <dvorapa@seznam.cz>
Gerrit-Reviewer: Legoktm <legoktm@member.fsf.org>
Gerrit-Reviewer: Multichill <maarten@mdammers.nl>
Gerrit-Reviewer: jenkins-bot (75)