Pywikibot-commits September 2018

pywikibot-commits@lists.wikimedia.org

1 participants
191 discussions

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/imagecopy.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462556 ) Change subject: [cleanup] cleanup scripts/imagecopy.py ...................................................................... [cleanup] cleanup scripts/imagecopy.py - use str.format(...) instead of modulo for type specifier arguments Change-Id: I22182e72d36b89758a2c424bec99ea3c27446215 --- M scripts/imagecopy.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py index 96d922b..21f78ec 100644 --- a/scripts/imagecopy.py +++ b/scripts/imagecopy.py @@ -412,7 +412,8 @@ # uploader.decode('utf-8') scrollbar = Tkinter.Scrollbar(self.root, orient=Tkinter.VERTICAL) label = Tkinter.Label(self.root, text='Enter new name or leave blank.') - imageinfo = Tkinter.Label(self.root, text='Uploaded by %s.' % uploader) + imageinfo = Tkinter.Label(self.root, text='Uploaded by {}.'.format( + uploader)) textarea = Tkinter.Text(self.root) textarea.insert(Tkinter.END, content.encode('utf-8')) textarea.config(state=Tkinter.DISABLED, -- To view, visit https://gerrit.wikimedia.org/r/462556 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: I22182e72d36b89758a2c424bec99ea3c27446215 Gerrit-Change-Number: 462556 Gerrit-PatchSet: 3 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/imagecopy_self.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462558 ) Change subject: [cleanup] cleanup scripts/imagecopy_self.py ...................................................................... [cleanup] cleanup scripts/imagecopy_self.py - remove preleading "u" from strings - use single quotes for string literals and double quotes **only** if they consist of single quotes within them - use str.format(...) instead of modulo for type specifier arguments Change-Id: I1545c231acc91f82a6d698fa53e19873d7c5be2e --- M scripts/imagecopy_self.py 1 file changed, 210 insertions(+), 209 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py index 254bc55..3c51a4b 100644 --- a/scripts/imagecopy_self.py +++ b/scripts/imagecopy_self.py @@ -79,82 +79,82 @@ NL = '' nowCommonsTemplate = { - 'de': u'{{NowCommons|%s}}', + 'de': '{{NowCommons|%s}}', 'en': ('{{NowCommons|1=File:%s|date=~~~~~|' 'reviewer={{subst:REVISIONUSER}}}}'), - 'lb': u'{{Elo op Commons|%s}}', - 'nds-nl': u'{{NoenCommons|1=File:%s}}', + 'lb': '{{Elo op Commons|%s}}', + 'nds-nl': '{{NoenCommons|1=File:%s}}', 'shared': ('{{NowCommons|1=File:%s|date=~~~~~|' 'reviewer={{subst:REVISIONUSER}}}}'), } moveToCommonsTemplate = { 'de': ['NowCommons', 'NC', 'NCT', 'Nowcommons'], - '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'], - 'lb': [u'Move to commons'], - 'nds-nl': [u'Noar Commons', u'VNC'], - 'shared': [u'Move'], + 'en': ['Commons ok', 'Copy to Wikimedia Commons', 'Move to commons', + 'Movetocommons', 'To commons', + 'Copy to Wikimedia Commons by BotMultichill'], + 'lb': ['Move to commons'], + 'nds-nl': ['Noar Commons', 'VNC'], + 'shared': ['Move'], } skipTemplates = { - 'de': [u'Löschprüfung', - u'NoCommons', - u'NowCommons', - u'NowCommons/Mängel', - u'NowCommons-Überprüft', - u'Wappenrecht', + 'de': ['Löschprüfung', + 'NoCommons', + 'NowCommons', + 'NowCommons/Mängel', + 'NowCommons-Überprüft', + 'Wappenrecht', ], - 'en': [u'Db-f1', - u'Db-f2', - u'Db-f3', - u'Db-f7', - u'Db-f8', - u'Db-f9', - u'Db-f10', - u'Do not move to Commons', - u'NowCommons', - u'CommonsNow', - u'Nowcommons', - u'NowCommonsThis', - u'Nowcommons2', - u'NCT', - u'Nowcommonsthis', - u'Moved to commons', - u'Now Commons', - u'Now at commons', - u'Db-nowcommons', - u'WikimediaCommons', - u'Now commons', - u'Di-no source', - u'Di-no license', - u'Di-no permission', - u'Di-orphaned fair use', - u'Di-no source no license', - u'Di-replaceable fair use', - u'Di-no fair use rationale', - u'Di-disputed fair use rationale', - u'Puf', - u'PUI', - u'Pui', - u'Ffd', - u'PD-user', # Only the self templates are supported for now. - u'Ticket Scan', - u'Non-free 2D art', - u'Non-free 3D art', - u'Non-free architectural work', - u'Non-free fair use in', + 'en': ['Db-f1', + 'Db-f2', + 'Db-f3', + 'Db-f7', + 'Db-f8', + 'Db-f9', + 'Db-f10', + 'Do not move to Commons', + 'NowCommons', + 'CommonsNow', + 'Nowcommons', + 'NowCommonsThis', + 'Nowcommons2', + 'NCT', + 'Nowcommonsthis', + 'Moved to commons', + 'Now Commons', + 'Now at commons', + 'Db-nowcommons', + 'WikimediaCommons', + 'Now commons', + 'Di-no source', + 'Di-no license', + 'Di-no permission', + 'Di-orphaned fair use', + 'Di-no source no license', + 'Di-replaceable fair use', + 'Di-no fair use rationale', + 'Di-disputed fair use rationale', + 'Puf', + 'PUI', + 'Pui', + 'Ffd', + 'PD-user', # Only the self templates are supported for now. + 'Ticket Scan', + 'Non-free 2D art', + 'Non-free 3D art', + 'Non-free architectural work', + 'Non-free fair use in', ], - 'lb': [u'Läschen', + 'lb': ['Läschen', ], - 'nds-nl': [u'Allinnig Wikipedie', - u'Bepark', - u'Gienidee', - u'NoenCommons', - u'NowCommons', + 'nds-nl': ['Allinnig Wikipedie', + 'Bepark', + 'Gienidee', + 'NoenCommons', + 'NowCommons', ], - 'shared': [u''], + 'shared': [''], } @@ -266,48 +266,48 @@ informationFields = { 'de': { - u'anmerkungen': u'remarks', # FIXME: More flexible - u'beschreibung': u'description', - u'quelle': u'source', - u'datum': u'date', - u'urheber': u'author', - u'permission': u'permission', - u'andere Versione': u'other versions', + 'anmerkungen': 'remarks', # FIXME: More flexible + 'beschreibung': 'description', + 'quelle': 'source', + 'datum': 'date', + 'urheber': 'author', + 'permission': 'permission', + 'andere Versione': 'other versions', }, 'en': { - u'location': u'remarks', - u'description': u'description', - u'source': u'source', - u'date': u'date', - u'author': u'author', - u'permission': u'permission', - u'other versions': u'other versions', + 'location': 'remarks', + 'description': 'description', + 'source': 'source', + 'date': 'date', + 'author': 'author', + 'permission': 'permission', + 'other versions': 'other versions', }, 'lb': { - u'location': u'remarks', - u'description': u'description', - u'source': u'source', - u'date': u'date', - u'author': u'author', - u'permission': u'permission', - u'other versions': u'other versions', + 'location': 'remarks', + 'description': 'description', + 'source': 'source', + 'date': 'date', + 'author': 'author', + 'permission': 'permission', + 'other versions': 'other versions', }, 'nds-nl': { - u'location': u'remarks', - u'description': u'description', - u'source': u'source', - u'date': u'date', - u'author': u'author', - u'permission': u'permission', - u'other versions': u'other versions', + 'location': 'remarks', + 'description': 'description', + 'source': 'source', + 'date': 'date', + 'author': 'author', + 'permission': 'permission', + 'other versions': 'other versions', }, 'shared': { - u'description': u'description', - u'source': u'source', - u'date': u'date', - u'author': u'author', - u'permission': u'permission', - u'other versions': u'other versions', + 'description': 'description', + 'source': 'source', + 'date': 'date', + 'author': 'author', + 'permission': 'permission', + 'other versions': 'other versions', }, } @@ -360,8 +360,8 @@ # First do autoskip. if self.doiskip(imagepage): pywikibot.output( - u'Skipping %s : Got a template on the skip list.' - % page.title()) + 'Skipping {} : Got a template on the skip list.' + .format(page.title())) return False text = imagepage.get() @@ -372,8 +372,8 @@ foundMatch = True if not foundMatch: pywikibot.output( - u'Skipping %s : No suitable license template was found.' - % page.title()) + 'Skipping {} : No suitable license template was found.' + .format(page.title())) return False self.prefetchQueue.put(self.getNewFields(imagepage)) @@ -386,35 +386,36 @@ for template in imagepage.templates(): if template in skipTemplates[imagepage.site.lang]: pywikibot.output( - u'Found %s which is on the template skip list' % template) + 'Found {} which is on the template skip list' + .format(template)) return True return False def getNewFields(self, imagepage): """Build a new description based on the imagepage.""" - if u'{{Information' in imagepage.get() or \ - u'{{information' in imagepage.get(): + if '{{Information' in imagepage.get() or \ + '{{information' in imagepage.get(): (description, date, source, author, permission, other_versions) = self.getNewFieldsFromInformation(imagepage) else: (description, date, source, author) = self.getNewFieldsFromFreetext(imagepage) - permission = u'' - other_versions = u'' + permission = '' + other_versions = '' licensetemplate = self.getNewLicensetemplate(imagepage) categories = self.getNewCategories(imagepage) - return {u'imagepage': imagepage, + return {'imagepage': imagepage, 'filename': imagepage.title(with_ns=False), - u'description': description, - u'date': date, - u'source': source, - u'author': author, - u'permission': permission, - u'other_versions': other_versions, - u'licensetemplate': licensetemplate, - u'categories': categories, - u'skip': False} + 'description': description, + 'date': date, + 'source': source, + 'author': author, + 'permission': permission, + 'other_versions': other_versions, + 'licensetemplate': licensetemplate, + 'categories': categories, + 'skip': False} def getNewFieldsFromInformation(self, imagepage): """Extract fields from current information template for new template. @@ -427,16 +428,16 @@ # FIXME: The implementation for German has to be checked for the # "strange" fields - description = u'' - source = u'' - date = u'' - author = u'' - permission = u'' - other_versions = u'' + description = '' + source = '' + date = '' + author = '' + permission = '' + other_versions = '' contents = {} for key, value in informationFields[imagepage.site.lang].items(): - contents[value] = u'' + contents[value] = '' information = informationTemplate[imagepage.site.lang] fields = informationFields[imagepage.site.lang] @@ -447,7 +448,7 @@ # Split at = field, sep, value = param.partition('=') # To lowercase, remove underscores and strip of spaces - field = field.lower().replace(u'_', u' ').strip() + field = field.lower().replace('_', ' ').strip() key = fields.get(field) # See if first part is in fields list if key: @@ -459,49 +460,49 @@ # Description # FIXME: Add {{<lang>|<original text>}} if <lang is valid at Commons - if contents[u'description']: - description = self.convertLinks(contents[u'description'], + if contents['description']: + description = self.convertLinks(contents['description'], imagepage.site()) - if contents.get(u'remarks') and contents[u'remarks']: - if description == u'': - description = self.convertLinks(contents[u'remarks'], + if contents.get('remarks') and contents['remarks']: + if description == '': + description = self.convertLinks(contents['remarks'], imagepage.site()) else: - description += u'<BR/>\n' + self.convertLinks( - contents[u'remarks'], imagepage.site()) + description += '<BR/>\n' + self.convertLinks( + contents['remarks'], imagepage.site()) # Source source = self.getSource(imagepage, - source=self.convertLinks(contents[u'source'], + source=self.convertLinks(contents['source'], imagepage.site())) # Date - if contents[u'date']: - date = contents[u'date'] + if contents['date']: + date = contents['date'] else: date = self.getUploadDate(imagepage) # Author - if not (contents[u'author'] == u'' or - contents[u'author'] == self.getAuthor(imagepage)): - author = self.convertLinks(contents[u'author'], imagepage.site()) + if not (contents['author'] == '' or + contents['author'] == self.getAuthor(imagepage)): + author = self.convertLinks(contents['author'], imagepage.site()) else: author = self.getAuthorText(imagepage) # Permission # Still have to filter out crap like "see below" or "yes" - if contents[u'permission']: + if contents['permission']: # Strip of the license temlate if it's in the permission section for (regex, repl) in licenseTemplates[imagepage.site.lang]: - contents[u'permission'] = re.sub(regex, u'', - contents[u'permission'], - flags=re.IGNORECASE) - permission = self.convertLinks(contents[u'permission'], + contents['permission'] = re.sub(regex, '', + contents['permission'], + flags=re.IGNORECASE) + permission = self.convertLinks(contents['permission'], imagepage.site()) # Other_versions - if contents[u'other versions']: - other_versions = self.convertLinks(contents[u'other versions'], + if contents['other versions']: + other_versions = self.convertLinks(contents['other versions'], imagepage.site()) return (description, date, source, author, permission, other_versions) @@ -514,10 +515,10 @@ # text = re.sub('\{\{(self|self2)\|[^\}]+\}\}', '', text, re.IGNORECASE) for toRemove in sourceGarbage[imagepage.site.lang]: - text = re.sub(toRemove, u'', text, flags=re.IGNORECASE) + text = re.sub(toRemove, '', text, flags=re.IGNORECASE) for (regex, repl) in licenseTemplates[imagepage.site.lang]: - text = re.sub(regex, u'', text, flags=re.IGNORECASE) + text = re.sub(regex, '', text, flags=re.IGNORECASE) text = pywikibot.removeCategoryLinks(text, imagepage.site()).strip() @@ -535,22 +536,22 @@ """ uploadtime = imagepage.getFileVersionHistory()[-1][0] - uploadDatetime = datetime.strptime(uploadtime, u'%Y-%m-%dT%H:%M:%SZ') - return (u'{{Date|' + str(uploadDatetime.year) + u'|' + - str(uploadDatetime.month) + u'|' + str(uploadDatetime.day) + - u'}} (original upload date)') + uploadDatetime = datetime.strptime(uploadtime, '%Y-%m-%dT%H:%M:%SZ') + return ('{{Date|' + str(uploadDatetime.year) + '|' + + str(uploadDatetime.month) + '|' + str(uploadDatetime.day) + + '}} (original upload date)') - def getSource(self, imagepage, source=u''): + def getSource(self, imagepage, source=''): """Get text to put in the source field of new information template.""" site = imagepage.site() lang = site.code family = site.family.name - if source == u'': - source = u'{{Own}}' + if source == '': + source = '{{Own}}' return (source.strip() + '<BR />Transferred from [http://%(lang)s.%(family)s.org ' - '%(lang)s.%(family)s]') % {u'lang': lang, u'family': family} + '%(lang)s.%(family)s]') % {'lang': lang, 'family': family} def getAuthorText(self, imagepage): """Get uploader to put in the author field of information template.""" @@ -561,8 +562,8 @@ firstuploader = self.getAuthor(imagepage) return ('[[:%(lang)s:User:%(firstuploader)s|%(firstuploader)s]] at ' '[http://%(lang)s.%(family)s.org %(lang)s.%(family)s]' - % {u'lang': lang, u'family': family, - u'firstuploader': firstuploader}) + % {'lang': lang, 'family': family, + 'firstuploader': firstuploader}) def getAuthor(self, imagepage): """Get the first uploader.""" @@ -577,8 +578,8 @@ (r'\[\[([^\[\]\|]+)\]\]', r'[[:%(lang)s:\1|\1]]'), ] for (regex, replacement) in conversions: - text = re.sub(regex, replacement % {u'lang': lang, - u'family': family}, text) + text = re.sub(regex, replacement % {'lang': lang, + 'family': family}, text) return text def getNewLicensetemplate(self, imagepage): @@ -587,16 +588,16 @@ site = imagepage.site() lang = site.code family = site.family.name - result = u'' + result = '' for (regex, replacement) in licenseTemplates[imagepage.site.lang]: match = re.search(regex, text, flags=re.IGNORECASE) if match: result = re.sub(regex, replacement, match.group(0), flags=re.IGNORECASE) - return result % {u'author': self.getAuthor(imagepage), - u'lang': lang, - u'family': family} + return result % {'author': self.getAuthor(imagepage), + 'lang': lang, + 'family': family} return result def getNewCategories(self, imagepage): @@ -605,12 +606,12 @@ Don't forget to filter. """ - result = u'' + result = '' (commonshelperCats, usage, galleries) = imagerecat.getCommonshelperCats(imagepage) newcats = imagerecat.applyAllFilters(commonshelperCats) for newcat in newcats: - result += u'[[Category:' + newcat + u']] ' + result += '[[Category:' + newcat + ']] ' return result @@ -649,7 +650,7 @@ # already taken. CommonsPage = pywikibot.Page(pywikibot.Site('commons', 'commons'), - u'File:' + fields.get('filename')) + 'File:' + fields.get('filename')) if CommonsPage.exists(): return False else: @@ -658,14 +659,14 @@ fields = TkdialogICS(fields).getnewmetadata() if fields.get('skip'): - pywikibot.output(u'Skipping %s : User pressed skip.' - % fields.get('imagepage').title()) + pywikibot.output('Skipping {} : User pressed skip.' + .format(fields.get('imagepage').title())) return False # Check if the image already exists CommonsPage = pywikibot.Page(pywikibot.Site('commons', 'commons'), - u'File:' + fields.get('filename')) + 'File:' + fields.get('filename')) if not CommonsPage.exists(): break else: @@ -753,7 +754,7 @@ self.information_licensetemplate_label = Tkinter.Label( self.root, text='License : ') self.information_categories_label = Tkinter.Label( - self.root, text=u'Categories : ') + self.root, text='Categories : ') self.filename_field = Tkinter.Entry(self.root) self.information_description = Tkinter.Entry(self.root) @@ -847,17 +848,17 @@ """Activate dialog and return new name and if the image is skipped.""" self.root.mainloop() - return {u'imagepage': self.imagepage, - u'filename': self.filename, - u'description': self.description, - u'date': self.date, - u'source': self.source, - u'author': self.author, - u'permission': self.permission, - u'other_versions': self.other_versions, - u'licensetemplate': self.licensetemplate, - u'categories': self.categories, - u'skip': self.skip} + return {'imagepage': self.imagepage, + 'filename': self.filename, + 'description': self.description, + 'date': self.date, + 'source': self.source, + 'author': self.author, + 'permission': self.permission, + 'other_versions': self.other_versions, + 'licensetemplate': self.licensetemplate, + 'categories': self.categories, + 'skip': self.skip} def open_in_browser(self): """The user pressed the View in browser button.""" @@ -910,7 +911,7 @@ lang = site.code family = site.family.name - cid = u'' + cid = '' if self.checktemplate: cid += ('\n{{BotMoveToCommons|%(lang)s.%(family)s' '|year={{subst:CURRENTYEAR}}' @@ -918,24 +919,24 @@ '|day={{subst:CURRENTDAY}}}}\n' % {'lang': lang, 'family': family} ) - cid += u'== {{int:filedesc}} ==\n' - cid += u'{{Information\n' - cid += u'|description=%(description)s\n' % fields - cid += u'|date=%(date)s\n' % fields - cid += u'|source=%(source)s\n' % fields - cid += u'|author=%(author)s\n' % fields - cid += u'|permission=%(permission)s\n' % fields - cid += u'|other_versions=%(other_versions)s\n' % fields - cid += u'}}\n' - cid += u'== {{int:license}} ==\n' - cid += u'%(licensetemplate)s\n' % fields - cid += u'\n' + cid += '== {{int:filedesc}} ==\n' + cid += '{{Information\n' + cid += '|description=%(description)s\n' % fields + cid += '|date=%(date)s\n' % fields + cid += '|source=%(source)s\n' % fields + cid += '|author=%(author)s\n' % fields + cid += '|permission=%(permission)s\n' % fields + cid += '|other_versions=%(other_versions)s\n' % fields + cid += '}}\n' + cid += '== {{int:license}} ==\n' + cid += '%(licensetemplate)s\n' % fields + cid += '\n' cid += self.getOriginalUploadLog(fields.get('imagepage')) - cid += u'__NOTOC__\n' - if fields.get('categories').strip() == u'': - cid = cid + u'{{Subst:Unc}}' + cid += '__NOTOC__\n' + if fields.get('categories').strip() == '': + cid = cid + '{{Subst:Unc}}' else: - cid = cid + u'%(categories)s\n' % fields + cid = cid + '%(categories)s\n' % fields return cid def getOriginalUploadLog(self, imagepage): @@ -952,17 +953,17 @@ family = site.family.name sourceimage = imagepage.site.get_address( - imagepage.title()).replace(u'&redirect=no&useskin=monobook', u'') + imagepage.title()).replace('&redirect=no&useskin=monobook', '') - result = u'== {{Original upload log}} ==\n' + result = '== {{Original upload log}} ==\n' result += ('The original description page is/was ' '[http://%(lang)s.%(family)s.org%(sourceimage)s here]. ' 'All following user names refer to %(lang)s.%(family)s.\n' - % {u'lang': lang, u'family': family, - u'sourceimage': sourceimage}) + % {'lang': lang, 'family': family, + 'sourceimage': sourceimage}) for (timestamp, username, resolution, size, comment) in filehistory: date = datetime.strptime( - timestamp, u'%Y-%m-%dT%H:%M:%SZ').strftime('%Y-%m-%d %H:%M') + timestamp, '%Y-%m-%dT%H:%M:%SZ').strftime('%Y-%m-%d %H:%M') result += ( '* %(date)s [[:%(lang)s:user:%(username)s|%(username)s]] ' "%(resolution)s (%(size)s bytes) ''" @@ -980,7 +981,7 @@ def tagNowcommons(self, imagepage, filename): """Tagged the imag which has been moved to Commons for deletion.""" if pywikibot.Page(pywikibot.Site('commons', 'commons'), - u'File:' + filename).exists(): + 'File:' + filename).exists(): # Get a fresh copy, force to get the page so we dont run into edit # conflicts imtxt = imagepage.get(force=True) @@ -1048,13 +1049,13 @@ return False if not supportedSite(): - pywikibot.output(u'Sorry, this site is not supported (yet).') + pywikibot.output('Sorry, this site is not supported (yet).') return False - pywikibot.warning(u'This is an experimental bot') - pywikibot.warning(u'It will only work on self published work images') - pywikibot.warning(u'This bot is still full of bugs') - pywikibot.warning(u'Use at your own risk!') + pywikibot.warning('This is an experimental bot') + pywikibot.warning('It will only work on self published work images') + pywikibot.warning('This bot is still full of bugs') + pywikibot.warning('Use at your own risk!') prefetchQueue = Queue(maxsize=50) uploadQueue = Queue(maxsize=200) @@ -1073,8 +1074,8 @@ userInteractionThread.setAutonomous() if not checkTemplate: - pywikibot.output(u'No check template will be added to the uploaded ' - u'files.') + pywikibot.output('No check template will be added to the uploaded ' + 'files.') uploaderThread.nochecktemplate() # Using the listed variables one may keep track of thread start status @@ -1083,5 +1084,5 @@ # uploadDone = uploaderThread.start() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462558 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: I1545c231acc91f82a6d698fa53e19873d7c5be2e Gerrit-Change-Number: 462558 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/image.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462561 ) Change subject: [cleanup] cleanup scripts/image.py ...................................................................... [cleanup] cleanup scripts/image.py - use str.format(...) instead of modulo for type specifier arguments - use single quotes for string literals Change-Id: Icd332d9c7a8f8fb2c235d6232cf229d4f2e14ed4 --- M scripts/image.py 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/image.py b/scripts/image.py index 374b821..ca3a664 100755 --- a/scripts/image.py +++ b/scripts/image.py @@ -109,9 +109,10 @@ if self.new_image: if not self.getOption('loose'): replacements.append((image_regex, - u'[[%s:%s\\g<parameters>]]' - % (self.site.namespaces.FILE.custom_name, - self.new_image))) + '[[{}:{}\\g<parameters>]]' + .format( + self.site.namespaces.FILE.custom_name, + self.new_image))) else: replacements.append((image_regex, self.new_image)) else: @@ -166,5 +167,5 @@ return False -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462561 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: Icd332d9c7a8f8fb2c235d6232cf229d4f2e14ed4 Gerrit-Change-Number: 462561 Gerrit-PatchSet: 3 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/illustrate_wikidata.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462565 ) Change subject: [cleanup] cleanup scripts/illustrate_wikidata.py ...................................................................... [cleanup] cleanup scripts/illustrate_wikidata.py - use single quotes for string literals - use str.format(...) instead of modulo for type specifier arguments - remove preleading "u" from strings - use "+" to concatenate strings in some cases Change-Id: I0bffc9d7ef2061921bec86e789e545b3e114652e --- M scripts/illustrate_wikidata.py 1 file changed, 11 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py index 7fc95a0..350ec36 100755 --- a/scripts/illustrate_wikidata.py +++ b/scripts/illustrate_wikidata.py @@ -48,12 +48,12 @@ claim = pywikibot.Claim(self.repo, self.wdproperty) if claim.type != 'commonsMedia': - raise ValueError(u'%s is of type %s, should be commonsMedia' - % (self.wdproperty, claim.type)) + raise ValueError('{} is of type {}, should be commonsMedia' + .format(self.wdproperty, claim.type)) def treat_page_and_item(self, page, item): """Treat a page / item.""" - pywikibot.output(u'Found %s' % item.title()) + pywikibot.output('Found ' + item.title()) imagename = page.properties().get('page_image_free') if not imagename: @@ -61,12 +61,12 @@ claims = item.get().get('claims') if self.wdproperty in claims: - pywikibot.output('Item %s already contains image (%s)' - % (item.title(), self.wdproperty)) + pywikibot.output('Item {} already contains image ({})' + .format(item.title(), self.wdproperty)) return newclaim = pywikibot.Claim(self.repo, self.wdproperty) - commonssite = pywikibot.Site("commons", "commons") + commonssite = pywikibot.Site('commons', 'commons') imagelink = pywikibot.Link(imagename, source=commonssite, default_namespace=6) image = pywikibot.FilePage(imagelink) @@ -74,8 +74,8 @@ image = pywikibot.FilePage(image.getRedirectTarget()) if not image.exists(): - pywikibot.output("%s doesn't exist so I can't link to it" - % image.title(as_link=True)) + pywikibot.output("{} doesn't exist so I can't link to it" + .format(image.title(as_link=True))) return newclaim.setTarget(image) @@ -96,13 +96,13 @@ local_args = pywikibot.handle_args(args) generator_factory = pagegenerators.GeneratorFactory() - wdproperty = u'P18' + wdproperty = 'P18' for arg in local_args: if arg.startswith('-property'): if len(arg) == 9: wdproperty = pywikibot.input( - u'Please enter the property you want to add:') + 'Please enter the property you want to add:') else: wdproperty = arg[10:] else: @@ -118,5 +118,5 @@ return True -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462565 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: I0bffc9d7ef2061921bec86e789e545b3e114652e Gerrit-Change-Number: 462565 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/imagetransger.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462544 ) Change subject: [cleanup] cleanup scripts/imagetransger.py ...................................................................... [cleanup] cleanup scripts/imagetransger.py - use single quotes for string literals - use str.format(...) instead of modulo for type specifier arguments - remove preleading "u" from strings - use "+" to concatenate strings in some cases Change-Id: Iee0594ceefdca570585c2e933f385b6ba485fc6d --- M scripts/imagetransfer.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index 3696a31..16189ab 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -141,7 +141,7 @@ """ sourceSite = sourceImagePage.site url = sourceImagePage.fileUrl().encode('utf-8') - pywikibot.output(u"URL should be: %s" % url) + pywikibot.output('URL should be: ' + url) # localize the text that should be printed on image description page try: description = sourceImagePage.get() @@ -209,8 +209,8 @@ """Print image list.""" for i, image in enumerate(imagelist): pywikibot.output('-' * 60) - pywikibot.output('%s. Found image: %s' - % (i, image.title(as_link=True))) + pywikibot.output('{}. Found image: {}' + .format(i, image.title(as_link=True))) try: # Show the image description page's contents pywikibot.output(image.get()) @@ -223,8 +223,8 @@ targetTitle = 'File:' + image.title().split(':', 1)[1] targetImage = pywikibot.Page(self.targetSite, targetTitle) targetImage.get() - pywikibot.output('Image with this name is already on %s.' - % self.targetSite) + pywikibot.output('Image with this name is already on {}.' + .format(self.targetSite)) pywikibot.output('-' * 60) pywikibot.output(targetImage.get()) sys.exit() @@ -332,5 +332,5 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462544 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: Iee0594ceefdca570585c2e933f385b6ba485fc6d Gerrit-Change-Number: 462544 Gerrit-PatchSet: 1 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [L10N] Update families files

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462555 ) Change subject: [L10N] Update families files ...................................................................... [L10N] Update families files Change-Id: I2a42b6c64cb583bda5d77967d4aafb0c43eef8fc --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikiversity_family.py 5 files changed, 23 insertions(+), 23 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index ee5a169..91e8c0b 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -36,7 +36,7 @@ 'en', 'hu', 'de', 'fr', 'pt', 'ja', 'it', 'nl', 'es', 'pl', 'th', 'he', 'id', 'fi', 'sq', 'fa', 'zh', 'ca', 'ru', 'az', 'vi', 'da', 'ko', 'sv', 'gl', 'sr', 'cs', 'hr', 'ba', 'no', 'tr', 'ar', 'ta', 'sa', 'sk', 'uk', - 'is', 'hi', 'ro', 'eo', 'si', 'mk', 'bn', 'bg', 'ka', 'lt', 'ms', 'tt', + 'is', 'hi', 'ro', 'eo', 'si', 'bn', 'mk', 'bg', 'ka', 'lt', 'ms', 'tt', 'li', 'el', 'ur', 'sl', 'km', 'kk', 'tl', 'et', 'be', 'ml', 'oc', 'ia', 'ne', 'hy', 'eu', 'pa', 'la', 'cv', 'tg', 'fy', 'ku', 'bs', 'cy', 'te', 'af', 'mr', 'mg', 'ky', diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 8480ad5..3b76c5d 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,32 +30,32 @@ languages_by_size = [ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'es', 'it', 'pl', 'war', - 'vi', 'ja', 'zh', 'pt', 'uk', 'fa', 'sr', 'ar', 'ca', 'no', 'sh', 'fi', - 'id', 'hu', 'ko', 'cs', 'ro', 'ms', 'tr', 'eu', 'eo', 'bg', 'hy', 'da', - 'he', 'zh-min-nan', 'sk', 'min', 'kk', 'ce', 'hr', 'lt', 'et', 'sl', + 'vi', 'ja', 'zh', 'pt', 'uk', 'fa', 'ar', 'sr', 'ca', 'no', 'sh', 'fi', + 'id', 'hu', 'ko', 'cs', 'ro', 'ms', 'tr', 'eu', 'eo', 'hy', 'bg', 'da', + 'he', 'zh-min-nan', 'sk', 'kk', 'min', 'ce', 'hr', 'lt', 'et', 'sl', 'be', 'el', 'gl', 'ur', 'nn', 'simple', 'az', 'uz', 'la', 'hi', 'th', 'ka', 'vo', 'ta', 'azb', 'cy', 'mk', 'tg', 'lv', 'ast', 'mg', 'oc', 'tl', 'tt', 'ky', 'bs', 'sq', 'new', 'te', 'zh-yue', 'br', 'pms', - 'be-tarask', 'bn', 'ml', 'af', 'jv', 'lb', 'ht', 'sco', 'mr', 'ga', + 'be-tarask', 'bn', 'af', 'ml', 'jv', 'lb', 'ht', 'sco', 'mr', 'ga', 'pnb', 'is', 'sw', 'ba', 'cv', 'fy', 'su', 'my', 'lmo', 'an', 'yo', 'nds', 'ne', 'pa', 'gu', 'io', 'bar', 'scn', 'bpy', 'als', 'kn', 'ku', - 'ckb', 'qu', 'ia', 'arz', 'mn', 'bat-smg', 'si', 'gd', 'wa', 'nap', - 'yi', 'am', 'or', 'bug', 'cdo', 'map-bms', 'hsb', 'mai', 'fo', 'mzn', - 'xmf', 'wuu', 'li', 'sah', 'ilo', 'sa', 'vec', 'eml', 'os', 'sd', + 'ckb', 'ia', 'qu', 'arz', 'mn', 'bat-smg', 'si', 'gd', 'wa', 'nap', + 'yi', 'am', 'or', 'bug', 'cdo', 'map-bms', 'hsb', 'mai', 'wuu', 'fo', + 'mzn', 'xmf', 'li', 'sah', 'ilo', 'sa', 'vec', 'eml', 'os', 'sd', 'mrj', 'mhr', 'hif', 'roa-tara', 'ps', 'diq', 'hak', 'pam', - 'zh-classical', 'bcl', 'nso', 'frr', 'bh', 'szl', 'ace', 'se', 'mi', - 'nah', 'nds-nl', 'km', 'rue', 'vls', 'gan', 'nv', 'crh', 'sc', 'bo', - 'vep', 'so', 'glk', 'co', 'tk', 'fiu-vro', 'lrc', 'myv', 'kv', 'csb', - 'as', 'gv', 'udm', 'zea', 'ay', 'ug', 'ie', 'nrm', 'stq', 'lez', 'sn', - 'kw', 'lad', 'pcd', 'mwl', 'gn', 'rm', 'gom', 'koi', 'ab', 'lij', 'mt', - 'fur', 'dsb', 'frp', 'ln', 'ang', 'dv', 'ext', 'cbk-zam', 'lo', 'haw', - 'dty', 'kab', 'lfn', 'ksh', 'gag', 'olo', 'pag', 'pi', 'av', 'pfl', + 'zh-classical', 'bcl', 'nso', 'bh', 'frr', 'szl', 'ace', 'se', 'mi', + 'nah', 'nds-nl', 'km', 'rue', 'vls', 'gan', 'nv', 'crh', 'so', 'sc', + 'bo', 'vep', 'glk', 'co', 'tk', 'fiu-vro', 'lrc', 'myv', 'kv', 'csb', + 'as', 'gv', 'udm', 'zea', 'ay', 'ug', 'ie', 'nrm', 'stq', 'sn', 'lez', + 'kw', 'lad', 'pcd', 'mwl', 'gn', 'rm', 'gom', 'koi', 'lij', 'ab', 'mt', + 'fur', 'dsb', 'frp', 'ln', 'ang', 'dv', 'ext', 'cbk-zam', 'haw', 'lo', + 'dty', 'lfn', 'kab', 'ksh', 'gag', 'olo', 'pag', 'pi', 'pfl', 'av', 'bxr', 'xal', 'krc', 'pap', 'ha', 'kaa', 'za', 'bjn', 'pdc', 'rw', 'gor', 'tyv', 'to', 'nov', 'kl', 'jam', 'arc', 'kbd', 'tpi', 'kbp', - 'tet', 'ki', 'ig', 'na', 'jbo', 'lbe', 'roa-rup', 'ty', 'mdf', 'kg', + 'tet', 'ig', 'ki', 'na', 'jbo', 'lbe', 'roa-rup', 'ty', 'mdf', 'kg', 'bi', 'wo', 'lg', 'srn', 'zu', 'tcy', 'chr', 'ltg', 'sm', 'inh', 'om', 'xh', 'pih', 'cu', 'rmy', 'tw', 'bm', 'tn', 'rn', 'chy', 'atj', 'got', - 'tum', 'ts', 'ak', 'st', 'ch', 'pnt', 'ss', 'fj', 'ny', 'ady', 'iu', + 'tum', 'ts', 'ak', 'st', 'ch', 'pnt', 'ss', 'ny', 'fj', 'ady', 'iu', 'sat', 'ee', 'ks', 've', 'ik', 'sg', 'ff', 'dz', 'ti', 'cr', 'din', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 8609f1b..1968c96 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -31,11 +31,11 @@ languages_by_size = [ 'en', 'it', 'pl', 'ru', 'cs', 'fa', 'de', 'pt', 'es', 'uk', 'sk', 'fr', - 'bs', 'he', 'fi', 'tr', 'ca', 'lt', 'th', 'bg', 'sl', 'eo', 'hy', 'zh', + 'bs', 'he', 'fi', 'tr', 'ca', 'lt', 'th', 'bg', 'sl', 'eo', 'zh', 'hy', 'hr', 'el', 'nn', 'id', 'az', 'ar', 'su', 'hu', 'li', 'ko', 'nl', 'ja', 'gu', 'sr', 'sv', 'gl', 'la', 'ur', 'te', 'ta', 'cy', 'et', 'no', 'ml', - 'vi', 'be', 'kn', 'ku', 'eu', 'ro', 'hi', 'ka', 'da', 'sa', 'sah', - 'is', 'sq', 'mr', 'br', 'af', 'uz', 'wo', 'ky', + 'vi', 'be', 'kn', 'ku', 'eu', 'ro', 'sq', 'hi', 'sah', 'ka', 'da', + 'sa', 'is', 'mr', 'br', 'af', 'uz', 'wo', 'ky', ] category_redirect_templates = { diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 2dac50c..2a4218d 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -29,8 +29,8 @@ languages_by_size = [ 'en', 'pl', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'cs', 'pt', - 'www', 'fa', 'hu', 'ml', 'gu', 'ko', 'sv', 'bn', 'sr', 'sl', 'sa', - 'te', 'uk', 'el', 'ro', 'fi', 'hy', 'ja', 'vi', 'th', 'az', 'ta', 'ca', + 'www', 'fa', 'hu', 'ml', 'gu', 'ko', 'sv', 'bn', 'sr', 'sl', 'te', + 'sa', 'uk', 'el', 'ro', 'fi', 'hy', 'ja', 'vi', 'th', 'az', 'ta', 'ca', 'br', 'kn', 'nl', 'hr', 'is', 'la', 'no', 'vec', 'eo', 'tr', 'et', 'be', 'mk', 'da', 'yi', 'id', 'pms', 'bg', 'li', 'mr', 'as', 'or', 'bs', 'sah', 'gl', 'lt', 'sk', 'eu', 'cy', 'pa', 'zh-min-nan', 'fo', diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index c6e713a..354b8cd 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -18,7 +18,7 @@ name = 'wikiversity' languages_by_size = [ - 'de', 'en', 'fr', 'ru', 'it', 'cs', 'beta', 'pt', 'es', 'ar', 'zh', + 'de', 'en', 'fr', 'ru', 'it', 'cs', 'pt', 'beta', 'es', 'ar', 'zh', 'sv', 'fi', 'sl', 'el', 'hi', 'ko', 'ja', ] -- To view, visit https://gerrit.wikimedia.org/r/462555 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: I2a42b6c64cb583bda5d77967d4aafb0c43eef8fc Gerrit-Change-Number: 462555 Gerrit-PatchSet: 1 Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [doc] remove pagegenerators replacement

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462517 ) Change subject: [doc] remove pagegenerators replacement ...................................................................... [doc] remove pagegenerators replacement remove pagegenerators replacement because no additional options are used except -namespace which is already listed in help doc detached from I4ef9009c91e Change-Id: Ibb92f59532ecfe23c6504d08a87cab6d8c63076a --- M scripts/patrol.py 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/patrol.py b/scripts/patrol.py index cbbcec5..c48d50f 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -27,8 +27,6 @@ https://en.wikisource.org/wiki/User:Wikisource-bot/patrol_whitelist -&params; - Commandline parameters ====================== @@ -67,12 +65,6 @@ _logger = 'patrol' -# This is required for the text that is shown when you run this script -# with the parameter -help. -docuReplacements = { - '&params;': pagegenerators.parameterHelp -} - class PatrolBot(SingleSiteBot): -- To view, visit https://gerrit.wikimedia.org/r/462517 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: Ibb92f59532ecfe23c6504d08a87cab6d8c63076a Gerrit-Change-Number: 462517 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/interwikidata.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462516 ) Change subject: [cleanup] cleanup scripts/interwikidata.py ...................................................................... [cleanup] cleanup scripts/interwikidata.py - use "+" for string concatenation in some cases - use str.format(...) instead of modulo for type specifier arguments Change-Id: I53c1a204dda6c7796aaa4365439b5290f417e890 --- M scripts/interwikidata.py 1 file changed, 16 insertions(+), 16 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index e9e3958..9944230 100644 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -121,8 +121,8 @@ title = page.title() data['sitelinks'][dbname] = {'site': dbname, 'title': title} data['labels'][site.lang] = {'language': site.lang, 'value': title} - summary = ('Bot: New item with sitelink(s) from %s' - % self.current_page.title(as_link=True, insite=self.repo)) + summary = ('Bot: New item with sitelink(s) from ' + + self.current_page.title(as_link=True, insite=self.repo)) item = pywikibot.ItemPage(self.repo) item.editEntity(data, new='item', summary=summary) @@ -147,8 +147,8 @@ dbnames = [iw_site.dbName() for iw_site in self.iwlangs] if set(dbnames) - set(self.current_item.sitelinks.keys()): if not self.handle_complicated(): - warning('Interwiki conflict in %s, skipping...' % - self.current_page.title(as_link=True)) + warning('Interwiki conflict in {}, skipping...' + .format(self.current_page.title(as_link=True))) return False output('Cleaning up the page') new_text = pywikibot.textlib.removeLanguageLinks( @@ -160,14 +160,14 @@ wd_data = set() for iw_page in self.iwlangs.values(): if not iw_page.exists(): - warning('Interwiki %s does not exist, skipping...' % - iw_page.title(as_link=True)) + warning('Interwiki {} does not exist, skipping...' + .format(iw_page.title(as_link=True))) continue try: wd_data.add(pywikibot.ItemPage.fromPage(iw_page)) except pywikibot.NoPage: - output('Interwiki %s does not have an item' % - iw_page.title(as_link=True)) + output('Interwiki {} does not have an item' + .format(iw_page.title(as_link=True))) return wd_data def try_to_add(self): @@ -177,16 +177,16 @@ # will create a new item with interwiki return None if len(wd_data) > 1: - warning('Interwiki conflict in %s, skipping...' % - self.current_page.title(as_link=True)) + warning('Interwiki conflict in {}, skipping...' + .format(self.current_page.title(as_link=True))) return False item = list(wd_data).pop() if self.current_page.site.dbName() in item.sitelinks: - warning('Interwiki conflict in %s, skipping...' % - item.title(as_link=True)) + warning('Interwiki conflict in {}, skipping...' + .format(item.title(as_link=True))) return False - output('Adding link to %s' % item.title()) - item.setSitelink(self.current_page, summary='Added %s' % ( + output('Adding link to ' + item.title()) + item.setSitelink(self.current_page, summary='Added ' + ( self.current_page.title(as_link=True, insite=item.site))) return item @@ -197,8 +197,8 @@ # todo: add links to item return None if len(wd_data) > 1: - warning('Interwiki conflict in %s, skipping...' % - self.current_page.title(as_link=True)) + warning('Interwiki conflict in {}, skipping...' + .format(self.current_page.title(as_link=True))) return False target_item = list(wd_data).pop() try: -- To view, visit https://gerrit.wikimedia.org/r/462516 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: I53c1a204dda6c7796aaa4365439b5290f417e890 Gerrit-Change-Number: 462516 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/isbn.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462511 ) Change subject: [cleanup] cleanup scripts/isbn.py ...................................................................... [cleanup] cleanup scripts/isbn.py - remove preleading "u" from strings - use single quotes for string literals and double quotes **only** if they consist of single quotes within them - use str.format(...) instead of modulo for type specifier arguments Change-Id: I017e5a7f1ee6b815a8d5bf2407c53ab579e8790c --- M scripts/isbn.py 1 file changed, 40 insertions(+), 36 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/isbn.py b/scripts/isbn.py index 2191dee..f6912db 100755 --- a/scripts/isbn.py +++ b/scripts/isbn.py @@ -1203,8 +1203,8 @@ publisherRanges = ranges[groupNumber] break else: - raise InvalidIsbnException('ISBN %s: group number unknown.' - % self.code) + raise InvalidIsbnException('ISBN {0}: group number unknown.' + .format(self.code)) # Determine the publisher for (start, end) in publisherRanges: @@ -1214,8 +1214,8 @@ rest = rest[length:] break else: - raise InvalidIsbnException('ISBN %s: publisher number unknown.' - % self.code) + raise InvalidIsbnException('ISBN {0}: publisher number unknown.' + .format(self.code)) # The rest is the item number and the 1-digit checksum. result += rest[:-1] + '-' + rest[-1] @@ -1245,17 +1245,18 @@ result.append(int(c)) elif c != '-': raise InvalidIsbnException( - 'The ISBN %s contains invalid characters.' % self.code) + 'The ISBN {0} contains invalid characters.' + .format(self.code)) return result def checkValidity(self): """Check validity of ISBN.""" if len(self.digits()) != 13: - raise InvalidIsbnException('The ISBN %s is not 13 digits long.' - % self.code) + raise InvalidIsbnException('The ISBN {0} is not 13 digits long.' + .format(self.code)) if self.calculateChecksum() != self.digits()[-1]: - raise InvalidIsbnException('The ISBN checksum of %s is incorrect.' - % self.code) + raise InvalidIsbnException('The ISBN checksum of {0} is incorrect.' + .format(self.code)) def calculateChecksum(self): """ @@ -1292,7 +1293,8 @@ result.append(c) elif c != '-': raise InvalidIsbnException( - 'The ISBN %s contains invalid characters.' % self.code) + 'The ISBN {0} contains invalid characters.' + .format(self.code)) return result def checkChecksum(self): @@ -1305,18 +1307,18 @@ lastDigit = self.digits()[-1] if not ((checksum == 10 and lastDigit in 'Xx') or (lastDigit.isdigit() and checksum == int(lastDigit))): - raise InvalidIsbnException('The ISBN checksum of %s is incorrect.' - % self.code) + raise InvalidIsbnException('The ISBN checksum of {0} is incorrect.' + .format(self.code)) def checkValidity(self): """Check validity of ISBN.""" if len(self.digits()) != 10: - raise InvalidIsbnException('The ISBN %s is not 10 digits long.' - % self.code) + raise InvalidIsbnException('The ISBN {0} is not 10 digits long.' + .format(self.code)) if 'X' in self.digits()[:-1] or 'x' in self.digits()[:-1]: raise InvalidIsbnException( - 'ISBN %s: X is only allowed at the end of the ISBN.' - % self.code) + 'ISBN {0}: X is only allowed at the end of the ISBN.' + .format(self.code)) self.checkChecksum() def toISBN13(self): @@ -1349,8 +1351,8 @@ try: i = ISBN10(code) except InvalidIsbnException as e10: - raise InvalidIsbnException(u'ISBN-13: %s / ISBN-10: %s' - % (e13, e10)) + raise InvalidIsbnException('ISBN-13: {0} / ISBN-10: {1}' + .format(e13, e10)) return i @@ -1515,21 +1517,21 @@ try: self.userPut(page, page.text, new_text, summary=self.comment) except pywikibot.EditConflict: - pywikibot.output(u'Skipping %s because of edit conflict' - % page.title()) + pywikibot.output('Skipping {0} because of edit conflict' + .format(page.title())) except pywikibot.SpamfilterError as e: pywikibot.output( - u'Cannot change %s because of blacklist entry %s' - % (page.title(), e.url)) + 'Cannot change {0} because of blacklist entry {1}' + .format(page.title(), e.url)) except pywikibot.LockedPage: - pywikibot.output(u'Skipping %s (locked page)' - % page.title()) + pywikibot.output('Skipping {0} (locked page)' + .format(page.title())) except pywikibot.NoPage: - pywikibot.output(u"Page %s does not exist" - % page.title(as_link=True)) + pywikibot.output('Page {0} does not exist' + .format(page.title(as_link=True))) except pywikibot.IsRedirectPage: - pywikibot.output(u"Page %s is a redirect; skipping." - % page.title(as_link=True)) + pywikibot.output('Page {0} is a redirect; skipping.' + .format(page.title(as_link=True))) def run(self): """Run the bot.""" @@ -1574,7 +1576,7 @@ pywikibot.output(e) continue - old_isbn = "ISBN " + isbn + old_isbn = 'ISBN ' + isbn if self.getOption('format'): new_isbn = hyphenateIsbnNumbers(old_isbn) @@ -1589,9 +1591,11 @@ item.claims[self.isbn_13_prop_id].append(claim) else: item.claims[self.isbn_13_prop_id] = [claim] - change_messages.append('Changing %s (%s) to %s (%s)' % - (self.isbn_10_prop_id, old_isbn, - self.isbn_13_prop_id, new_isbn)) + change_messages.append('Changing {0} ({1}) to {2} ({3})' + .format(self.isbn_10_prop_id, + old_isbn, + self.isbn_13_prop_id, + new_isbn)) continue if old_isbn == new_isbn: @@ -1615,13 +1619,13 @@ pywikibot.output(e) continue - old_isbn = "ISBN " + isbn + old_isbn = 'ISBN ' + isbn new_isbn = hyphenateIsbnNumbers(old_isbn) if old_isbn == new_isbn: continue change_messages.append( - 'Changing %s (%s --> %s)' % (self.isbn_13_prop_id, - claim.getTarget(), new_isbn)) + 'Changing {0} ({1} --> {2})'.format( + self.isbn_13_prop_id, claim.getTarget(), new_isbn)) claim.setTarget(new_isbn) if change_messages: @@ -1676,5 +1680,5 @@ return False -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462511 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: I017e5a7f1ee6b815a8d5bf2407c53ab579e8790c Gerrit-Change-Number: 462511 Gerrit-PatchSet: 3 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/login.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462504 ) Change subject: [cleanup] cleanup scripts/login.py ...................................................................... [cleanup] cleanup scripts/login.py - use single quotes for string literals and double quotes **only** if they consist of single quotes within them - use str.format(...) instead of modulo for type specifier arguments Change-Id: I6c37e385ca9feefa4c22876d8b65203329920894 --- M scripts/login.py 1 file changed, 12 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/login.py b/scripts/login.py index 04f20ad..969ddff 100755 --- a/scripts/login.py +++ b/scripts/login.py @@ -126,21 +126,22 @@ autocreate = False unknown_args = [] for arg in pywikibot.handle_args(args): - if arg.startswith("-pass"): + if arg.startswith('-pass'): if len(arg) == 5: password = pywikibot.input( 'Password for all accounts (no characters will be shown):', password=True) else: password = arg[6:] - elif arg == "-sysop": + elif arg == '-sysop': sysop = True - elif arg == "-all": + elif arg == '-all': logall = True - elif arg == "-force": - pywikibot.output(u"To force a re-login, please delete the revelant " - u"lines from '%s' (or the entire file) and try again." % - join(config.base_dir, 'pywikibot.lwp')) + elif arg == '-force': + pywikibot.output('To force a re-login, please delete the ' + "revelant lines from '{0}' (or the entire file) " + 'and try again.' + .format(join(config.base_dir, 'pywikibot.lwp'))) elif arg == "-logout": logout = True elif arg == '-oauth': @@ -188,9 +189,10 @@ pywikibot.output( 'Not logged in on {0}.'.format(site)) except SiteDefinitionError: - pywikibot.output(u'%s.%s is not a valid site, please remove it' - ' from your config' % (lang, family_name)) + pywikibot.output('{0}.{1} is not a valid site, ' + 'please remove it from your config' + .format(lang, family_name)) -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462504 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: I6c37e385ca9feefa4c22876d8b65203329920894 Gerrit-Change-Number: 462504 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2018