jenkins-bot merged this change.

View Change

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
[cleanup] cleanup scripts/flickrripper.py

- use str.format(...) instead of modulo for type specifier
arguments.

Change-Id: Iafa8a11fd24cea16b2e3ba387eb0ff11410ce392
---
M scripts/flickrripper.py
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py
index 6437bce..795a45c 100755
--- a/scripts/flickrripper.py
+++ b/scripts/flickrripper.py
@@ -199,11 +199,11 @@
title = ''
# Should probably have the id of the photo as last resort.

- if pywikibot.Page(site, 'File:%s - %s - %s.jpg'
- % (title, project, username)).exists():
+ if pywikibot.Page(site, 'File:{} - {} - {}.jpg'
+ .format(title, project, username)).exists():
i = 1
while True:
- name = '%s - %s - %s (%d).jpg' % (title, project, username, i)
+ name = '{} - {} - {} ({}).jpg'.format(title, project, username, i)
if pywikibot.Page(site, 'File:' + name).exists():
i += 1
else:
@@ -246,7 +246,7 @@
The description is based on the info from flickrinfo and improved.

"""
- description = '== {{int:filedesc}} ==\n%s' % flinfoDescription
+ description = '== {{int:filedesc}} ==\n{}'.format(flinfoDescription)
if removeCategories:
description = textlib.removeCategoryLinks(description,
pywikibot.Site(

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

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafa8a11fd24cea16b2e3ba387eb0ff11410ce392
Gerrit-Change-Number: 462683
Gerrit-PatchSet: 2
Gerrit-Owner: D3r1ck01 <alangiderick@gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb@gmail.com>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot (75)