jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378066 )

Change subject: Fix authentication of flickrripper.py ......................................................................

Fix authentication of flickrripper.py

No need to get a token anymore. The underlying library handles all the oauth stuff.

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

Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved

diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 7fd1fb1..8afd672 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -431,12 +431,6 @@

if 'api_secret' in config.flickr and config.flickr['api_secret']: flickr = flickrapi.FlickrAPI(config.flickr['api_key'], config.flickr['api_secret']) - (token, frob) = flickr.get_token_part_one(perms='read') - if not token: - # The user still hasn't authorised this app yet, get_token_part_one() - # will have spawn a browser window - pywikibot.input("Press ENTER after you authorized this program") - flickr.get_token_part_two((token, frob)) else: pywikibot.output('Accessing public content only') flickr = flickrapi.FlickrAPI(config.flickr['api_key'])