jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/446239 )
Change subject: [cleanup] Code cleanup
......................................................................
[cleanup] Code cleanup
- keep lines below 80 chars
- remove preleading "u" from strings
- use single quotes
detached from
https://gerrit.wikimedia.org/r/#/c/pywikibot/core/+/444437/
Change-Id: Id246229c488342d1e9e3bee53dac76b6a828ddff
---
M scripts/imagecopy.py
1 file changed, 125 insertions(+), 124 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py
index 8787eda..956da12 100644
--- a/scripts/imagecopy.py
+++ b/scripts/imagecopy.py
@@ -100,113 +100,113 @@
}
nowCommonsTemplate = {
- '_default': u'{{NowCommons|%s}}',
- 'af': u'{{NowCommons|File:%s}}',
- 'als': u'{{NowCommons|%s}}',
- 'am': u'{{NowCommons|File:%s}}',
- 'ang': u'{{NowCommons|File:%s}}',
- 'ar': u'{{الآن كومنز|%s}}',
- 'ast': u'{{EnCommons|File:%s}}',
- 'az': u'{{NowCommons|%s}}',
- 'bar': u'{{NowCommons|%s}}',
- 'bg': u'{{NowCommons|%s}}',
- 'bn': u'{{NowCommons|File:%s}}',
- 'bs': u'{{NowCommons|%s}}',
- 'ca': u'{{AraCommons|%s}}',
- 'cs': u'{{NowCommons|%s}}',
- 'cy': u'{{NowCommons|File:%s}}',
- 'da': u'{{NowCommons|File:%s}}',
- 'de': u'{{NowCommons|%s}}',
- 'dsb': u'{{NowCommons|%s}}',
- 'el': u'{{NowCommons|%s}}',
- 'en': u'{{subst:ncd|%s}}',
- 'eo': u'{{Nun en komunejo|%s}}',
- 'es': u'{{EnCommons|File:%s}}',
- 'et': u'{{NüüdCommonsis|File:%s}}',
- 'fa': u'{{NowCommons|%s}}',
- 'fi': u'{{NowCommons|%s}}',
- 'fo': u'{{NowCommons|File:%s}}',
- 'fr': u'{{Image sur Commons|%s}}',
- 'fy': u'{{NowCommons|%s}}',
- 'ga': u'{{Ag Cómhaoin|File:%s}}',
- 'gl': u'{{EnCommons]|File:%s}}',
- 'gv': u'{{NowCommons|File:%s}}',
- 'he': u'{{גם בוויקישיתוף|%s}}',
- 'hr': u'{{NowCommons|%s}}',
- 'hsb': u'{{NowCommons|%s}}',
- 'hu': u'{{Azonnali-commons|%s}}',
- 'ia': u'{{NowCommons|File:%s}}',
- 'id': u'{{NowCommons|File:%s}}',
- 'ilo': u'{{NowCommons|File:%s}}',
- 'io': u'{{NowCommons|%s}}',
- 'is': u'{{NowCommons|%s}}',
- 'it': u'{{NowCommons|%s}}',
- 'ja': u'{{NowCommons|File:%s}}',
- 'jv': u'{{NowCommons|File:%s}}',
- 'ka': u'{{NowCommons|File:%s}}',
- 'kn': u'{{NowCommons|File:%s}}',
- 'ko': u'{{NowCommons|File:%s}}',
- 'ku': u'{{NowCommons|%s}}',
- 'lb': u'{{Elo op Commons|%s}}',
- 'li': u'{{NowCommons|%s}}',
- 'lt': u'{{NowCommons|File:%s}}',
- 'lv': u'{{NowCommons|File:%s}}',
- 'mk': u'{{NowCommons|File:%s}}',
- 'mn': u'{{NowCommons|File:%s}}',
- 'ms': u'{{NowCommons|%s}}',
- 'nds-nl': u'{{NoenCommons|File:%s}}',
- 'nl': u'{{NuCommons|%s}}',
- 'nn': u'{{No på Commons|File:%s}}',
- 'no': u'{{NowCommons|%s}}',
- 'oc': u'{{NowCommons|File:%s}}',
- 'pl': u'{{NowCommons|%s}}',
- 'pt': u'{{NowCommons|%s}}',
- 'ro': u'{{AcumCommons|File:%s}}',
- 'ru': u'{{Перенесено на Викисклад|%s}}',
- 'sa': u'{{NowCommons|File:%s}}',
- 'scn': u'{{NowCommons|File:%s}}',
- 'sh': u'{{NowCommons|File:%s}}',
- 'sk': u'{{NowCommons|File:%s}}',
- 'sl': u'{{OdslejZbirka|%s}}',
- 'sq': u'{{NowCommons|File:%s}}',
- 'sr': u'{{NowCommons|File:%s}}',
- 'st': u'{{NowCommons|File:%s}}',
- 'su': u'{{IlaharKiwari|File:%s}}',
- 'sv': u'{{NowCommons|%s}}',
- 'sw': u'{{NowCommons|%s}}',
- 'ta': u'{{NowCommons|File:%s}}',
- 'th': u'{{มีที่คอมมอนส์|File:%s}}',
- 'tl': u'{{NasaCommons|File:%s}}',
- 'tr': u'{{NowCommons|%s}}',
- 'uk': u'{{NowCommons|File:%s}}',
- 'ur': u'{{NowCommons|File:%s}}',
- 'vec': u'{{NowCommons|%s}}',
- 'vi': u'{{NowCommons|File:%s}}',
- 'vo': u'{{InKobädikos|%s}}',
- 'wa': u'{{NowCommons|%s}}',
- 'zh': u'{{NowCommons|File:%s}}',
- 'zh-min-nan': u'{{Commons ū|%s}}',
- 'zh-yue': u'{{subst:Ncd|File:%s}}',
+ '_default': '{{NowCommons|%s}}',
+ 'af': '{{NowCommons|File:%s}}',
+ 'als': '{{NowCommons|%s}}',
+ 'am': '{{NowCommons|File:%s}}',
+ 'ang': '{{NowCommons|File:%s}}',
+ 'ar': '{{الآن كومنز|%s}}',
+ 'ast': '{{EnCommons|File:%s}}',
+ 'az': '{{NowCommons|%s}}',
+ 'bar': '{{NowCommons|%s}}',
+ 'bg': '{{NowCommons|%s}}',
+ 'bn': '{{NowCommons|File:%s}}',
+ 'bs': '{{NowCommons|%s}}',
+ 'ca': '{{AraCommons|%s}}',
+ 'cs': '{{NowCommons|%s}}',
+ 'cy': '{{NowCommons|File:%s}}',
+ 'da': '{{NowCommons|File:%s}}',
+ 'de': '{{NowCommons|%s}}',
+ 'dsb': '{{NowCommons|%s}}',
+ 'el': '{{NowCommons|%s}}',
+ 'en': '{{subst:ncd|%s}}',
+ 'eo': '{{Nun en komunejo|%s}}',
+ 'es': '{{EnCommons|File:%s}}',
+ 'et': '{{NüüdCommonsis|File:%s}}',
+ 'fa': '{{NowCommons|%s}}',
+ 'fi': '{{NowCommons|%s}}',
+ 'fo': '{{NowCommons|File:%s}}',
+ 'fr': '{{Image sur Commons|%s}}',
+ 'fy': '{{NowCommons|%s}}',
+ 'ga': '{{Ag Cómhaoin|File:%s}}',
+ 'gl': '{{EnCommons]|File:%s}}',
+ 'gv': '{{NowCommons|File:%s}}',
+ 'he': '{{גם בוויקישיתוף|%s}}',
+ 'hr': '{{NowCommons|%s}}',
+ 'hsb': '{{NowCommons|%s}}',
+ 'hu': '{{Azonnali-commons|%s}}',
+ 'ia': '{{NowCommons|File:%s}}',
+ 'id': '{{NowCommons|File:%s}}',
+ 'ilo': '{{NowCommons|File:%s}}',
+ 'io': '{{NowCommons|%s}}',
+ 'is': '{{NowCommons|%s}}',
+ 'it': '{{NowCommons|%s}}',
+ 'ja': '{{NowCommons|File:%s}}',
+ 'jv': '{{NowCommons|File:%s}}',
+ 'ka': '{{NowCommons|File:%s}}',
+ 'kn': '{{NowCommons|File:%s}}',
+ 'ko': '{{NowCommons|File:%s}}',
+ 'ku': '{{NowCommons|%s}}',
+ 'lb': '{{Elo op Commons|%s}}',
+ 'li': '{{NowCommons|%s}}',
+ 'lt': '{{NowCommons|File:%s}}',
+ 'lv': '{{NowCommons|File:%s}}',
+ 'mk': '{{NowCommons|File:%s}}',
+ 'mn': '{{NowCommons|File:%s}}',
+ 'ms': '{{NowCommons|%s}}',
+ 'nds-nl': '{{NoenCommons|File:%s}}',
+ 'nl': '{{NuCommons|%s}}',
+ 'nn': '{{No på Commons|File:%s}}',
+ 'no': '{{NowCommons|%s}}',
+ 'oc': '{{NowCommons|File:%s}}',
+ 'pl': '{{NowCommons|%s}}',
+ 'pt': '{{NowCommons|%s}}',
+ 'ro': '{{AcumCommons|File:%s}}',
+ 'ru': '{{Перенесено на Викисклад|%s}}',
+ 'sa': '{{NowCommons|File:%s}}',
+ 'scn': '{{NowCommons|File:%s}}',
+ 'sh': '{{NowCommons|File:%s}}',
+ 'sk': '{{NowCommons|File:%s}}',
+ 'sl': '{{OdslejZbirka|%s}}',
+ 'sq': '{{NowCommons|File:%s}}',
+ 'sr': '{{NowCommons|File:%s}}',
+ 'st': '{{NowCommons|File:%s}}',
+ 'su': '{{IlaharKiwari|File:%s}}',
+ 'sv': '{{NowCommons|%s}}',
+ 'sw': '{{NowCommons|%s}}',
+ 'ta': '{{NowCommons|File:%s}}',
+ 'th': '{{มีที่คอมมอนส์|File:%s}}',
+ 'tl': '{{NasaCommons|File:%s}}',
+ 'tr': '{{NowCommons|%s}}',
+ 'uk': '{{NowCommons|File:%s}}',
+ 'ur': '{{NowCommons|File:%s}}',
+ 'vec': '{{NowCommons|%s}}',
+ 'vi': '{{NowCommons|File:%s}}',
+ 'vo': '{{InKobädikos|%s}}',
+ 'wa': '{{NowCommons|%s}}',
+ 'zh': '{{NowCommons|File:%s}}',
+ 'zh-min-nan': '{{Commons ū|%s}}',
+ 'zh-yue': '{{subst:Ncd|File:%s}}',
}
moveToCommonsTemplate = {
- 'ar': [u'نقل إلى كومنز'],
- 'en': [u'Commons ok', u'Copy to Wikimedia Commons',
u'Move to commons',
- u'Movetocommons', u'To commons',
- u'Copy to Wikimedia Commons by BotMultichill'],
- 'fi': [u'Commonsiin'],
- 'fr': [u'Image pour Commons'],
- 'hsb': [u'Kopěruj do Wikimedia Commons'],
- 'hu': [u'Commonsba'],
- 'is': [u'Færa á Commons'],
- 'ms': [u'Hantar ke Wikimedia Commons'],
- 'nl': [u'Verplaats naar Wikimedia Commons', u'VNC'],
- 'pl': [u'Do Commons', u'NaCommons', u'Na Commons'],
- 'ru': [u'На Викисклад'],
- 'sl': [u'Skopiraj v Zbirko'],
- 'sr': [u'За оставу'],
- 'sv': [u'Till Commons'],
- 'zh': [u'Copy to Wikimedia Commons'],
+ 'ar': ['نقل إلى كومنز'],
+ 'en': ['Commons ok', 'Copy to Wikimedia Commons', 'Move
to commons',
+ 'Movetocommons', 'To commons',
+ 'Copy to Wikimedia Commons by BotMultichill'],
+ 'fi': ['Commonsiin'],
+ 'fr': ['Image pour Commons'],
+ 'hsb': ['Kopěruj do Wikimedia Commons'],
+ 'hu': ['Commonsba'],
+ 'is': ['Færa á Commons'],
+ 'ms': ['Hantar ke Wikimedia Commons'],
+ 'nl': ['Verplaats naar Wikimedia Commons', 'VNC'],
+ 'pl': ['Do Commons', 'NaCommons', 'Na Commons'],
+ 'ru': ['На Викисклад'],
+ 'sl': ['Skopiraj v Zbirko'],
+ 'sr': ['За оставу'],
+ 'sv': ['Till Commons'],
+ 'zh': ['Copy to Wikimedia Commons'],
}
@@ -269,7 +269,7 @@
tablock = CH.split('<textarea ')[1].split('>')[0]
CH = CH.split('<textarea ' + tablock +
'>')[1].split('</textarea>')[0]
- CH = CH.replace(u'×', u'×')
+ CH = CH.replace('×', '×')
CH = self.fixAuthor(CH)
pywikibot.output(CH)
@@ -281,9 +281,10 @@
'|day={{subst:CURRENTDAY}}}}' + CH)
if self.category:
- CH = CH.replace('{{subst:Unc}} <!-- Remove this line once you have
'
- 'added categories -->', '')
- CH += u'[[Category:' + self.category + u']]'
+ CH = CH.replace(
+ '{{subst:Unc}} <!-- Remove this line once you have '
+ 'added categories -->', '')
+ CH += '[[Category:' + self.category + ']]'
bot = UploadRobot(url=self.imagePage.fileUrl(), description=CH,
useFilename=self.newname, keepFilename=True,
@@ -293,7 +294,7 @@
# Should check if the image actually was uploaded
if pywikibot.Page(self.image_repo,
- u'Image:' + self.newname).exists():
+ 'Image:' + self.newname).exists():
# Get a fresh copy, force to get the page so we dont run into edit
# conflicts
imtxt = self.imagePage.get(force=True)
@@ -373,7 +374,7 @@
# -label ok skip view
# textarea
-archivo = config.datafilepath("Uploadbot.localskips.txt")
+archivo = config.datafilepath('Uploadbot.localskips.txt')
if not path.exists(archivo):
with open(archivo, 'w') as tocreate:
tocreate.write('{{NowCommons')
@@ -402,12 +403,12 @@
self.root = Tkinter.Tk()
# "%dx%d%+d%+d" % (width, height, xoffset, yoffset)
# Always appear the same size and in the bottom-left corner
- self.root.geometry("600x200+100-100")
+ self.root.geometry('600x200+100-100')
self.root.title(image_title)
self.changename = ''
self.skip = 0
self.url = url
- self.uploader = "Unknown"
+ self.uploader = 'Unknown'
# uploader.decode('utf-8')
scrollbar = Tkinter.Scrollbar(self.root, orient=Tkinter.VERTICAL)
label = Tkinter.Label(self.root, text='Enter new name or leave blank.')
@@ -420,17 +421,17 @@
scrollbar.config(command=textarea.yview)
self.entry = Tkinter.Entry(self.root)
- self.templatelist = Tkinter.Listbox(self.root, bg="white", height=5)
+ self.templatelist = Tkinter.Listbox(self.root, bg='white', height=5)
for template in templates:
self.templatelist.insert(Tkinter.END, template)
- autoskip_button = Tkinter.Button(self.root, text="Add to AutoSkip",
+ autoskip_button = Tkinter.Button(self.root, text='Add to AutoSkip',
command=self.add2_auto_skip)
browser_button = Tkinter.Button(self.root, text='View in browser',
command=self.open_in_browser)
skip_button = Tkinter.Button(self.root, text='Skip',
command=self.skip_file)
- ok_button = Tkinter.Button(self.root, text="OK", command=self.ok_file)
+ ok_button = Tkinter.Button(self.root, text='OK', command=self.ok_file)
# Start grid
label.grid(row=0)
@@ -495,7 +496,7 @@
"""Process command line arguments and invoke bot."""
imagepage = None
always = False
- category = u''
+ category = ''
delete_after_done = False
# Load a lot of default generators
local_args = pywikibot.handle_args(args)
@@ -518,13 +519,13 @@
for page in pregenerator:
skip = False
- if page.exists() and (page.namespace() == 6) and (
- not page.isRedirectPage()):
+ if page.exists() and page.namespace() == 6 \
+ and not page.isRedirectPage():
imagepage = pywikibot.FilePage(page.site, page.title())
# First do autoskip.
if doiskip(imagepage.get()):
- pywikibot.output("Skipping " + page.title())
+ pywikibot.output('Skipping ' + page.title())
skip = True
else:
# The first upload is last in the list.
@@ -538,13 +539,13 @@
newname = imagepage.title(with_ns=False)
CommonsPage = pywikibot.Page(pywikibot.Site('commons',
'commons'),
- u'File:%s' % newname)
+ 'File:' + newname)
if CommonsPage.exists():
skip = True
else:
while True:
# Do the TkdialogIC to accept/reject and change te name
- (newname, skip) = TkdialogIC(
+ newname, skip = TkdialogIC(
imagepage.title(with_ns=False),
imagepage.get(), username,
imagepage.permalink(with_protocol=True),
@@ -564,7 +565,7 @@
# Check if the image already exists
CommonsPage = pywikibot.Page(
imagepage.site.image_repository(),
- u'File:' + newname)
+ 'File:' + newname)
if not CommonsPage.exists():
break
else:
@@ -583,8 +584,8 @@
for openthread in threading.enumerate():
if openthread != threading.currentThread():
openthread.join()
- pywikibot.output(u'All threads are done')
+ pywikibot.output('All threads are done')
-if __name__ == "__main__":
+if __name__ == '__main__':
main()
--
To view, visit
https://gerrit.wikimedia.org/r/446239
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id246229c488342d1e9e3bee53dac76b6a828ddff
Gerrit-Change-Number: 446239
Gerrit-PatchSet: 4
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot