September 2018 - Pywikibot-commits

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/movepages.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462474 ) Change subject: [cleanup] cleanup scripts/movepages.py ...................................................................... [cleanup] cleanup scripts/movepages.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 - remove preleading "u" from strings Change-Id: I55bb75c75cc5bf017a9a162e7667a521cd86877e --- M scripts/movepages.py 1 file changed, 40 insertions(+), 35 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/movepages.py b/scripts/movepages.py index 9866c7a..0fb5ba7 100755 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -83,9 +83,8 @@ msg = self.getOption('summary') if not msg: msg = i18n.twtranslate(page.site, 'movepages-moving') - pywikibot.output(u'Moving page %s to [[%s]]' - % (page.title(as_link=True), - newPageTitle)) + pywikibot.output('Moving page {0} to [[{1}]]' + .format(page.title(as_link=True), newPageTitle)) page.move( newPageTitle, reason=msg, movetalk=self.getOption('movetalkpage'), @@ -97,65 +96,70 @@ """Treat a single page.""" self.current_page = page if self.getOption('skipredirects') and page.isRedirectPage(): - pywikibot.output(u'Page %s is a redirect; skipping.' % page.title()) + pywikibot.output('Page {0} is a redirect; skipping.' + .format(page.title())) return pagetitle = page.title(with_ns=False) namesp = page.site.namespace(page.namespace()) if self.appendAll: - newPageTitle = (u'%s%s%s' - % (self.pagestart, pagetitle, self.pageend)) + newPageTitle = ('{0}{1}{2}'.format(self.pagestart, pagetitle, + self.pageend)) if not self.noNamespace and namesp: - newPageTitle = (u'%s:%s' % (namesp, newPageTitle)) + newPageTitle = ('{0}:{1}'.format(namesp, newPageTitle)) elif self.regexAll: newPageTitle = self.regex.sub(self.replacePattern, pagetitle) if not self.noNamespace and namesp: - newPageTitle = (u'%s:%s' % (namesp, newPageTitle)) + newPageTitle = ('{0}:{1}'.format(namesp, newPageTitle)) if self.getOption('prefix'): - newPageTitle = (u'%s%s' % (self.getOption('prefix'), pagetitle)) + newPageTitle = ('{0}{1}'.format(self.getOption('prefix'), + pagetitle)) if self.getOption('prefix') or self.appendAll or self.regexAll: - if self.user_confirm('Change the page title to "%s"?' - % newPageTitle): + if self.user_confirm('Change the page title to "{0}"?' + .format(newPageTitle)): self.moveOne(page, newPageTitle) else: - choice = pywikibot.input_choice(u'What do you want to do?', + choice = pywikibot.input_choice('What do you want to do?', [('change page name', 'c'), ('append to page name', 'a'), ('use a regular expression', 'r'), ('next page', 'n')]) if choice == 'c': - newPageTitle = pywikibot.input(u'New page name:') + newPageTitle = pywikibot.input('New page name:') self.moveOne(page, newPageTitle) elif choice == 'a': - self.pagestart = pywikibot.input(u'Append this to the start:') - self.pageend = pywikibot.input(u'Append this to the end:') - newPageTitle = (u'%s%s%s' - % (self.pagestart, pagetitle, self.pageend)) + self.pagestart = pywikibot.input('Append this to the start:') + self.pageend = pywikibot.input('Append this to the end:') + newPageTitle = ('{0}{1}{2}'.format(self.pagestart, pagetitle, + self.pageend)) if namesp: - if pywikibot.input_yn(u'Do you want to remove the ' - 'namespace prefix "%s:"?' % namesp, + if pywikibot.input_yn('Do you want to remove the ' + 'namespace prefix "{0}:"?' + .format(namesp), automatic_quit=False): self.noNamespace = True else: - newPageTitle = (u'%s:%s' % (namesp, newPageTitle)) + newPageTitle = ('{0}:{1}'.format(namesp, newPageTitle)) choice2 = pywikibot.input_choice( - u'Change the page title to "%s"?' - % newPageTitle, [('yes', 'y'), ('no', 'n'), ('all', 'a')]) + 'Change the page title to "{0}"?' + .format(newPageTitle), + [('yes', 'y'), ('no', 'n'), ('all', 'a')]) if choice2 == 'y': self.moveOne(page, newPageTitle) elif choice2 == 'a': self.appendAll = True self.moveOne(page, newPageTitle) elif choice == 'r': - searchPattern = pywikibot.input(u'Enter the search pattern:') + searchPattern = pywikibot.input('Enter the search pattern:') self.replacePattern = pywikibot.input( - u'Enter the replace pattern:') + 'Enter the replace pattern:') self.regex = re.compile(searchPattern) if page.title() == page.title(with_ns=False): newPageTitle = self.regex.sub(self.replacePattern, page.title()) else: - if pywikibot.input_yn(u'Do you want to remove the ' - 'namespace prefix "%s:"?' % namesp, + if pywikibot.input_yn('Do you want to remove the ' + 'namespace prefix "{0}:"?' + .format(namesp), automatic_quit=False): newPageTitle = self.regex.sub( self.replacePattern, page.title(with_ns=False)) @@ -164,8 +168,9 @@ newPageTitle = self.regex.sub(self.replacePattern, page.title()) choice2 = pywikibot.input_choice( - u'Change the page title to "%s"?' - % newPageTitle, [('yes', 'y'), ('no', 'n'), ('all', 'a')]) + 'Change the page title to "{0}"?' + .format(newPageTitle), + [('yes', 'y'), ('no', 'n'), ('all', 'a')]) if choice2 == 'y': self.moveOne(page, newPageTitle) elif choice2 == 'a': @@ -199,7 +204,7 @@ elif arg.startswith('-pairsfile'): if len(arg) == len('-pairsfile'): filename = pywikibot.input( - u'Enter the name of the file containing pairs:') + 'Enter the name of the file containing pairs:') else: filename = arg[len('-pairsfile:'):] oldName1 = None @@ -211,7 +216,7 @@ oldName1 = page.title() if oldName1: pywikibot.warning( - u'file %s contains odd number of links' % filename) + 'file {0} contains odd number of links'.format(filename)) elif arg == '-noredirect': options['noredirect'] = True elif arg == '-notalkpage': @@ -222,29 +227,29 @@ options['skipredirects'] = True elif arg.startswith('-from:'): if oldName: - pywikibot.warning(u'-from:%s without -to:' % oldName) + pywikibot.warning('-from:{0} without -to:'.format(oldName)) oldName = arg[len('-from:'):] elif arg.startswith('-to:'): if oldName: fromToPairs.append([oldName, arg[len('-to:'):]]) oldName = None else: - pywikibot.warning(u'%s without -from' % arg) + pywikibot.warning('{0} without -from'.format(arg)) elif arg.startswith('-prefix'): if len(arg) == len('-prefix'): - options['prefix'] = pywikibot.input(u'Enter the prefix:') + options['prefix'] = pywikibot.input('Enter the prefix:') else: options['prefix'] = arg[8:] elif arg.startswith('-summary'): if len(arg) == len('-summary'): - options['summary'] = pywikibot.input(u'Enter the summary:') + options['summary'] = pywikibot.input('Enter the summary:') else: options['summary'] = arg[9:] else: genFactory.handleArg(arg) if oldName: - pywikibot.warning(u'-from:%s without -to:' % oldName) + pywikibot.warning('-from:{0} without -to:'.format(oldName)) site = pywikibot.Site() for pair in fromToPairs: page = pywikibot.Page(site, pair[0]) -- To view, visit https://gerrit.wikimedia.org/r/462474 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: I55bb75c75cc5bf017a9a162e7667a521cd86877e Gerrit-Change-Number: 462474 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/misspelling.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462481 ) Change subject: [cleanup] cleanup scripts/misspelling.py ...................................................................... [cleanup] cleanup scripts/misspelling.py - remove preleading "u" from strings - use single quotes for string literals Change-Id: I51a0db45c763c54d754a262469c3388df41a3852 --- M scripts/misspelling.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/misspelling.py b/scripts/misspelling.py index 1add235..8a7f06c 100755 --- a/scripts/misspelling.py +++ b/scripts/misspelling.py @@ -66,9 +66,9 @@ 'da': 'Omdirigeringer af fejlstavninger', 'de': ('Kategorie:Wikipedia:Falschschreibung', 'Kategorie:Wikipedia:Obsolete Schreibung'), - 'en': u'Redirects from misspellings', - 'hu': u'Átirányítások hibás névről', - 'nl': u'Categorie:Wikipedia:Redirect voor spelfout', + 'en': 'Redirects from misspellings', + 'hu': 'Átirányítások hibás névről', + 'nl': 'Categorie:Wikipedia:Redirect voor spelfout', } def __init__(self, always, firstPageTitle, main_only): @@ -104,8 +104,8 @@ for misspellingTemplateName in templates) if firstPageTitle: pywikibot.output( - u'-start parameter unsupported on this wiki because there ' - u'is no category for misspellings.') + '-start parameter unsupported on this wiki because there ' + 'is no category for misspellings.') else: pywikibot.output(HELP_MSG.format(site=self.site)) @@ -188,5 +188,5 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462481 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: I51a0db45c763c54d754a262469c3388df41a3852 Gerrit-Change-Number: 462481 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/match_images.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462483 ) Change subject: [cleanup] cleanup scripts/match_images.py ...................................................................... [cleanup] cleanup scripts/match_images.py - remove preleading "u" from strings - use single quotes for string literals Change-Id: Ia1a89061fd8aca9e599bf78e6836e4e2a0c89897 --- M scripts/match_images.py 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/match_images.py b/scripts/match_images.py index 59b1c07..e9f6899 100755 --- a/scripts/match_images.py +++ b/scripts/match_images.py @@ -141,8 +141,8 @@ def main(*args): """Extracting file page information of images to work on and initiate matching.""" images = [] - other_family = u'' - other_lang = u'' + other_family = '' + other_lang = '' imagePageA = None imagePageB = None @@ -152,12 +152,14 @@ for arg in local_args: if arg.startswith('-otherfamily:'): if len(arg) == len('-otherfamily:'): - other_family = pywikibot.input(u'What family do you want to use?') + other_family = pywikibot.input( + 'What family do you want to use?') else: other_family = arg[len('-otherfamily:'):] elif arg.startswith('-otherlang:'): if len(arg) == len('-otherlang:'): - other_lang = pywikibot.input(u'What language do you want to use?') + other_lang = pywikibot.input( + 'What language do you want to use?') else: other_lang = arg[len('otherlang:'):] else: @@ -187,5 +189,5 @@ match_image_pages(imagePageA, imagePageB) -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462483 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: Ia1a89061fd8aca9e599bf78e6836e4e2a0c89897 Gerrit-Change-Number: 462483 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] clean scripts/patrol.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462446 ) Change subject: [cleanup] clean scripts/patrol.py ...................................................................... [cleanup] clean scripts/patrol.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 - use "+" to concatenate strings in some cases Change-Id: I73fa2def2842bf2005f0b751557fcaafc370721a --- M scripts/patrol.py 1 file changed, 52 insertions(+), 52 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/patrol.py b/scripts/patrol.py index 3c0e8a0..cbbcec5 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -80,7 +80,7 @@ # Localised name of the whitelist page whitelist_subpage_name = { - 'en': u'patrol_whitelist', + 'en': 'patrol_whitelist', } def __init__(self, site=True, **kwargs): @@ -108,10 +108,9 @@ else: local_whitelist_subpage_name = pywikibot.translate( self.site, self.whitelist_subpage_name, fallback=True) - self.whitelist_pagename = u'%s:%s/%s' % ( - self.site.namespace(2), - self.site.username(), - local_whitelist_subpage_name) + self.whitelist_pagename = '{0}:{1}/{2}'.format( + self.site.namespace(2), self.site.username(), + local_whitelist_subpage_name) self.whitelist = None self.whitelist_ts = 0 self.whitelist_load_ts = 0 @@ -136,14 +135,14 @@ if (self.whitelist_load_ts and (time.time() - self.whitelist_load_ts < self.getOption('versionchecktime'))): if pywikibot.config.verbose_output: - pywikibot.output(u'Whitelist not stale yet') + pywikibot.output('Whitelist not stale yet') return whitelist_page = pywikibot.Page(self.site, self.whitelist_pagename) if not self.whitelist: - pywikibot.output(u'Loading %s' % self.whitelist_pagename) + pywikibot.output('Loading ' + self.whitelist_pagename) try: if self.whitelist_ts: @@ -155,11 +154,11 @@ # it has been effectively reloaded 'now' self.whitelist_load_ts = time.time() if pywikibot.config.verbose_output: - pywikibot.output(u'Whitelist not modified') + pywikibot.output('Whitelist not modified') return if self.whitelist: - pywikibot.output(u'Reloading whitelist') + pywikibot.output('Reloading whitelist') # Fetch whitelist wikitext = whitelist_page.get() @@ -172,12 +171,12 @@ # cascade if there isnt a whitelist to fallback on if not self.whitelist: raise - pywikibot.error(u'%s' % e) + pywikibot.error('{0}'.format(e)) def in_list(self, pagelist, title): """Check if title present in pagelist.""" if pywikibot.config.verbose_output: - pywikibot.output(u'Checking whitelist for: %s' % title) + pywikibot.output('Checking whitelist for: ' + title) # quick check for exact match if title in pagelist: @@ -186,16 +185,16 @@ # quick check for wildcard if '' in pagelist: if pywikibot.config.verbose_output: - pywikibot.output(u'wildcarded') + pywikibot.output('wildcarded') return '.*' for item in pagelist: if pywikibot.config.verbose_output: - pywikibot.output('checking against whitelist item = %s' % item) + pywikibot.output('checking against whitelist item = ' + item) if isinstance(item, LinkedPagesRule): if pywikibot.config.verbose_output: - pywikibot.output(u'invoking programmed rule') + pywikibot.output('invoking programmed rule') if item.match(title): return item @@ -203,7 +202,7 @@ return item if pywikibot.config.verbose_output: - pywikibot.output(u'not found') + pywikibot.output('not found') def parse_page_tuples(self, wikitext, user=None): """Parse page details apart from 'user:' for use.""" @@ -234,13 +233,13 @@ if name.lower() in self._prefixindex_aliases: if not prefix: if pywikibot.config.verbose_output: - pywikibot.output(u'Whitelist everything') + pywikibot.output('Whitelist everything') page = '' else: page = prefix if pywikibot.config.verbose_output: - pywikibot.output(u'Whitelist prefixindex hack ' - u'for: %s' % page) + pywikibot.output('Whitelist prefixindex hack ' + 'for: ' + page) # p = pywikibot.Page(self.site, obj.target[20:]) # obj.namespace = p.namespace # obj.target = p.title() @@ -251,7 +250,7 @@ # the user will be the target of subsequent rules current_user = obj.title if pywikibot.config.verbose_output: - pywikibot.output(u'Whitelist user: %s' % current_user) + pywikibot.output('Whitelist user: ' + current_user) continue else: page = obj.canonical_title() @@ -260,20 +259,20 @@ if not user or current_user == user: if self.is_wikisource_author_page(page): if pywikibot.config.verbose_output: - pywikibot.output('Whitelist author: %s' % page) + pywikibot.output('Whitelist author: ' + page) page = LinkedPagesRule(page) else: if pywikibot.config.verbose_output: - pywikibot.output(u'Whitelist page: %s' % page) + pywikibot.output('Whitelist page: ' + page) if pywikibot.config.verbose_output: pywikibot.output('Adding {0}:{1}' .format(current_user, page)) whitelist[current_user].append(page) elif pywikibot.config.verbose_output: - pywikibot.output(u'Discarding whitelist page for ' - u'another user: %s' % page) + pywikibot.output('Discarding whitelist page for ' + 'another user: ' + page) else: - raise Exception(u'No user set for page %s' % page) + raise Exception('No user set for page ' + page) return dict(whitelist) @@ -289,12 +288,12 @@ pass if author_ns: author_ns_prefix = self.site.namespace(author_ns) - pywikibot.debug(u'Author ns: %d; name: %s' - % (author_ns, author_ns_prefix), _logger) + pywikibot.debug('Author ns: {0}; name: {1}' + .format(author_ns, author_ns_prefix), _logger) if title.find(author_ns_prefix + ':') == 0: if pywikibot.config.verbose_output: author_page_name = title[len(author_ns_prefix) + 1:] - pywikibot.output(u'Found author %s' % author_page_name) + pywikibot.output('Found author ' + author_page_name) return True def run(self, feed=None): @@ -332,23 +331,23 @@ self.repeat_start_ts = time.time() if pywikibot.config.verbose_output or self.getOption('ask'): - pywikibot.output(u'User %s has created or modified page %s' - % (username, title)) + pywikibot.output('User {0} has created or modified page {1}' + .format(username, title)) if self.getOption('autopatroluserns') and (page['ns'] == 2 or page['ns'] == 3): # simple rule to whitelist any user editing their own userspace if title.partition(':')[2].split('/')[0].startswith(username): if pywikibot.config.verbose_output: - pywikibot.output(u'%s is whitelisted to modify %s' - % (username, title)) + pywikibot.output('{0} is whitelisted to modify {1}' + .format(username, title)) choice = True if not choice and username in self.whitelist: if self.in_list(self.whitelist[username], title): if pywikibot.config.verbose_output: - pywikibot.output(u'%s is whitelisted to modify %s' - % (username, title)) + pywikibot.output('{0} is whitelisted to modify {1}' + .format(username, title)) choice = True if self.getOption('ask'): @@ -360,11 +359,11 @@ # list() iterates over patrol() which returns a generator list(self.site.patrol(rcid)) self.patrol_counter = self.patrol_counter + 1 - pywikibot.output(u'Patrolled %s (rcid %d) by user %s' - % (title, rcid, username)) + pywikibot.output('Patrolled {0} (rcid {1}) by user {2}' + .format(title, rcid, username)) else: if pywikibot.config.verbose_output: - pywikibot.output(u'Skipped') + pywikibot.output('Skipped') if rcid > self.highest_rcid: self.highest_rcid = rcid @@ -372,20 +371,20 @@ self.rc_item_counter = self.rc_item_counter + 1 except pywikibot.NoPage: - pywikibot.output(u'Page %s does not exist; skipping.' - % title(as_link=True)) + pywikibot.output('Page {0} does not exist; skipping.' + .format(title(as_link=True))) except pywikibot.IsRedirectPage: - pywikibot.output(u'Page %s is a redirect; skipping.' - % title(as_link=True)) + pywikibot.output('Page {0} is a redirect; skipping.' + .format(title(as_link=True))) def title_match(prefix, title): """Match title substring with given prefix.""" if pywikibot.config.verbose_output: - pywikibot.output(u'Matching %s to prefix %s' % (title, prefix)) + pywikibot.output('Matching {0} to prefix {1}'.format(title, prefix)) if title.startswith(prefix): if pywikibot.config.verbose_output: - pywikibot.output(u'substr match') + pywikibot.output('substr match') return True return @@ -418,7 +417,7 @@ if not self.linkedpages: if pywikibot.config.verbose_output: - pywikibot.output(u'loading page links on %s' % self.page_title) + pywikibot.output('loading page links on ' + self.page_title) p = pywikibot.Page(self.site, self.page_title) linkedpages = [] for linkedpage in p.linkedPages(): @@ -426,14 +425,15 @@ self.linkedpages = linkedpages if pywikibot.config.verbose_output: - pywikibot.output(u'Loaded %d page links' % len(linkedpages)) + pywikibot.output('Loaded {0} page links' + .format(len(linkedpages))) for p in self.linkedpages: if pywikibot.config.verbose_output: - pywikibot.output(u"Checking against '%s'" % p) + pywikibot.output("Checking against '{0}'".format(p)) if title_match(p, page_title): if pywikibot.config.verbose_output: - pywikibot.output(u'Matched.') + pywikibot.output('Matched.') return p @@ -452,7 +452,7 @@ else: yield page[1] if repeat: - pywikibot.output(u'Sleeping for %d seconds' % delay) + pywikibot.output('Sleeping for {0} seconds'.format(delay)) pywikibot.sleep(delay) else: break @@ -488,7 +488,7 @@ elif arg.startswith('-versionchecktime:'): versionchecktime = arg[len('-versionchecktime:'):] options['versionchecktime'] = int(versionchecktime) - elif arg.startswith("-whitelist:"): + elif arg.startswith('-whitelist:'): options['whitelist'] = arg[len('-whitelist:'):] else: generator = gen_factory.handleArg(arg) @@ -518,7 +518,7 @@ bot = PatrolBot(**options) if newpages or usercontribs: - pywikibot.output(u'Newpages:') + pywikibot.output('Newpages:') gen = site.newpages feed = api_feed_repeater(gen, delay=60, repeat=repeat, user=usercontribs, @@ -527,15 +527,15 @@ bot.run(feed) if recentchanges or usercontribs: - pywikibot.output(u'Recentchanges:') + pywikibot.output('Recentchanges:') gen = site.recentchanges feed = api_feed_repeater(gen, delay=60, repeat=repeat, namespaces=gen_factory.namespaces, user=usercontribs) bot.run(feed) - pywikibot.output(u'%d/%d patrolled' - % (bot.patrol_counter, bot.rc_item_counter)) + pywikibot.output('{0}/{1} patrolled' + .format(bot.patrol_counter, bot.rc_item_counter)) if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/462446 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: I73fa2def2842bf2005f0b751557fcaafc370721a Gerrit-Change-Number: 462446 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/replace.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462404 ) Change subject: [cleanup] cleanup scripts/replace.py ...................................................................... [cleanup] cleanup scripts/replace.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 - use "+" to concatenate strings in some cases Change-Id: I23723262299d44ca02f12f10e393f19a40bd9d2c --- M scripts/replace.py 1 file changed, 53 insertions(+), 51 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index f36d6d2..dd6924d 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -430,9 +430,9 @@ self.skipping = bool(xmlStart) self.excsInside = [] - if "inside-tags" in self.exceptions: + if 'inside-tags' in self.exceptions: self.excsInside += self.exceptions['inside-tags'] - if "inside" in self.exceptions: + if 'inside' in self.exceptions: self.excsInside += self.exceptions['inside'] from pywikibot import xmlreader if site: @@ -468,8 +468,8 @@ try: if not self.skipping: pywikibot.output( - u'To resume, use "-xmlstart:%s" on the command line.' - % entry.title) + 'To resume, use "-xmlstart:{0}" on the command line.' + .format(entry.title)) except NameError: pass @@ -479,11 +479,11 @@ @rtype: bool """ - if "title" in self.exceptions: + if 'title' in self.exceptions: for exc in self.exceptions['title']: if exc.search(title): return True - if "require-title" in self.exceptions: + if 'require-title' in self.exceptions: for req in self.exceptions['require-title']: if not req.search(title): # if not all requirements are met: return True @@ -496,7 +496,7 @@ @rtype: bool """ - if "text-contains" in self.exceptions: + if 'text-contains' in self.exceptions: for exc in self.exceptions['text-contains']: if exc.search(text): return True @@ -609,7 +609,7 @@ @rtype: bool """ - if "text-contains" in self.exceptions: + if 'text-contains' in self.exceptions: for exc in self.exceptions['text-contains']: if exc.search(original_text): return True @@ -710,11 +710,11 @@ else: comma = self.site.mediawiki_message('comma-separator') default_summary = comma.join( - u'-{0} +{1}'.format(*default_summary) + '-{0} +{1}'.format(*default_summary) for default_summary in default_summaries) summary_messages.insert(0, i18n.twtranslate( self.site, 'replace-replacing', - {'description': u' ({0})'.format(default_summary)} + {'description': ' ({0})'.format(default_summary)} )) semicolon = self.site.mediawiki_message('semicolon-separator') return semicolon.join(summary_messages) @@ -726,19 +726,19 @@ for page in self.generator: if self.isTitleExcepted(page.title()): pywikibot.output( - u'Skipping %s because the title is on the exceptions list.' - % page.title(as_link=True)) + 'Skipping {0} because the title is on the exceptions list.' + .format(page.title(as_link=True))) continue try: # Load the page's text from the wiki original_text = page.get(get_redirect=True) if not page.canBeEdited(): - pywikibot.output(u"You can't edit page %s" - % page.title(as_link=True)) + pywikibot.output("You can't edit page " + + page.title(as_link=True)) continue except pywikibot.NoPage: - pywikibot.output('Page %s not found' % page.title( - as_link=True)) + pywikibot.output('Page {0} not found' + .format(page.title(as_link=True))) continue applied = set() new_text = original_text @@ -746,9 +746,9 @@ context = 0 while True: if self.isTextExcepted(new_text): - pywikibot.output(u'Skipping %s because it contains text ' - u'that is on the exceptions list.' - % page.title(as_link=True)) + pywikibot.output('Skipping {0} because it contains text ' + 'that is on the exceptions list.' + .format(page.title(as_link=True))) break while new_text != last_text: last_text = new_text @@ -757,8 +757,8 @@ if not self.recursive: break if new_text == original_text: - pywikibot.output(u'No changes were necessary in %s' - % page.title(as_link=True)) + pywikibot.output('No changes were necessary in ' + + page.title(as_link=True)) break if hasattr(self, 'addedCat'): # Fetch only categories in wikitext, otherwise the others @@ -777,7 +777,7 @@ if self.getOption('always'): break choice = pywikibot.input_choice( - u'Do you want to accept these changes?', + 'Do you want to accept these changes?', [('Yes', 'y'), ('No', 'n'), ('Edit original', 'e'), ('edit Latest', 'l'), ('open in Browser', 'b'), ('More context', 'm'), ('All', 'a')], @@ -806,8 +806,8 @@ try: original_text = page.get(get_redirect=True, force=True) except pywikibot.NoPage: - pywikibot.output(u'Page %s has been deleted.' - % page.title()) + pywikibot.output('Page {0} has been deleted.' + .format(page.title())) break new_text = original_text last_text = None @@ -822,8 +822,9 @@ quiet=True) while not self._pending_processed_titles.empty(): proc_title, res = self._pending_processed_titles.get() - pywikibot.output('Page %s%s saved' - % (proc_title, '' if res else ' not')) + pywikibot.output('Page {0}{1} saved' + .format(proc_title, + '' if res else ' not')) # choice must be 'N' break if self.getOption('always') and new_text != original_text: @@ -832,23 +833,24 @@ page.save(summary=self.generate_summary(applied), callback=self._replace_sync_callback, quiet=True) 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.PageNotSaved as error: - pywikibot.output(u'Error putting page: %s' - % (error.args,)) + pywikibot.output('Error putting page: {0}' + .format(error.args,)) if self._pending_processed_titles.qsize() > 50: while not self._pending_processed_titles.empty(): proc_title, res = self._pending_processed_titles.get() - pywikibot.output('Page %s%s saved' - % (proc_title, '' if res else ' not')) + pywikibot.output('Page {0}{1} saved' + .format(proc_title, + '' if res else ' not')) def prepareRegexForMySQL(pattern): @@ -876,7 +878,7 @@ add_cat = None gen = None # summary message - edit_summary = u"" + edit_summary = '' # Array which will collect commandline parameters. # First element is original text, second element is replacement text. commandline_replacements = [] @@ -936,7 +938,7 @@ elif arg.startswith('-xmlstart'): if len(arg) == 9: xmlStart = pywikibot.input( - u'Please enter the dumped article to start with:') + 'Please enter the dumped article to start with:') else: xmlStart = arg[10:] elif arg.startswith('-xml'): @@ -996,7 +998,7 @@ if arg == '-pairsfile': replacement_file = pywikibot.input( - u'Please enter the filename to read replacements from:') + 'Please enter the filename to read replacements from:') else: replacement_file = arg[len('-pairsfile:'):] else: @@ -1019,7 +1021,7 @@ # strip newlines, but not other characters file_replacements = f.read().splitlines() except (IOError, OSError) as e: - pywikibot.error(u'Error loading {0}: {1}'.format( + pywikibot.error('Error loading {0}: {1}'.format( replacement_file, e)) return False @@ -1030,13 +1032,13 @@ return False # Strip BOM from first line - file_replacements[0].lstrip(u'\uFEFF') + file_replacements[0].lstrip('\uFEFF') commandline_replacements.extend(file_replacements) if not(commandline_replacements or fixes_set) or manual_input: old = pywikibot.input('Please enter the text that should be replaced:') while old: - new = pywikibot.input(u'Please enter the new text:') + new = pywikibot.input('Please enter the new text:') commandline_replacements += [old, new] old = pywikibot.input( 'Please enter another text that should be replaced,' @@ -1051,7 +1053,7 @@ single_summary = i18n.twtranslate( site, 'replace-replacing', {'description': - ' (-%s +%s)' % (replacement.old, replacement.new)} + ' (-{0} +{1})'.format(replacement.old, replacement.new)} ) replacements.append(replacement) @@ -1062,8 +1064,8 @@ try: fix = fixes.fixes[fix_name] except KeyError: - pywikibot.output(u'Available predefined fixes are: %s' - % ', '.join(fixes.fixes.keys())) + pywikibot.output('Available predefined fixes are: {0}' + .format(', '.join(fixes.fixes.keys()))) if not fixes.user_fixes_loaded: pywikibot.output('The user fixes file could not be found: ' '{0}'.format(fixes.filename)) @@ -1072,7 +1074,7 @@ pywikibot.warning('No replacements defined for fix ' '"{0}"'.format(fix_name)) continue - if "msg" in fix: + if 'msg' in fix: if isinstance(fix['msg'], basestring): set_summary = i18n.twtranslate(site, str(fix['msg'])) else: @@ -1133,9 +1135,9 @@ if ((not edit_summary or edit_summary is True) and (missing_fixes_summaries or single_summary)): if single_summary: - pywikibot.output(u'The summary message for the command line ' - 'replacements will be something like: %s' - % single_summary) + pywikibot.output('The summary message for the command line ' + 'replacements will be something like: ' + + single_summary) if missing_fixes_summaries: pywikibot.output('The summary will not be used when the fix has ' 'one defined but the following fix(es) do(es) ' @@ -1206,8 +1208,8 @@ # Explicitly call pywikibot.stopme(). It will make sure the callback is # triggered before replace.py is unloaded. pywikibot.stopme() - pywikibot.output(u'\n%s pages changed.' % bot.changed_pages) + pywikibot.output('\n{0} pages changed.'.format(bot.changed_pages)) -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462404 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: I23723262299d44ca02f12f10e393f19a40bd9d2c Gerrit-Change-Number: 462404 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/pagefromfile.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462448 ) Change subject: [cleanup] cleanup scripts/pagefromfile.py ...................................................................... [cleanup] cleanup scripts/pagefromfile.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: I8610b993b8016162c7378313825431ad312df55c --- M scripts/pagefromfile.py 1 file changed, 18 insertions(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 09b7f8e..52f1d44 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -139,23 +139,25 @@ else: comment = i18n.twtranslate(self.site, 'pagefromfile-msg') - comment_top = comment + " - " + i18n.twtranslate( + comment_top = comment + ' - ' + i18n.twtranslate( self.site, 'pagefromfile-msg_top') - comment_bottom = comment + " - " + i18n.twtranslate( + comment_bottom = comment + ' - ' + i18n.twtranslate( self.site, 'pagefromfile-msg_bottom') - comment_force = "%s *** %s ***" % ( + comment_force = '{0} *** {1} ***'.format( comment, i18n.twtranslate(self.site, 'pagefromfile-msg_force')) if page.exists(): if not self.getOption('redirect') and page.isRedirectPage(): - pywikibot.output(u"Page %s is redirect, skipping!" % title) + pywikibot.output('Page {0} is redirect, skipping!' + .format(title)) return pagecontents = page.text nocontent = self.getOption('nocontent') if nocontent and ( nocontent in pagecontents or nocontent.lower() in pagecontents): - pywikibot.output('Page has %s so it is skipped' % nocontent) + pywikibot.output('Page has {0} so it is skipped' + .format(nocontent)) return if self.getOption('append'): separator = self.getOption('append')[1] @@ -171,11 +173,12 @@ .format(title, self.getOption('append')[0])) contents = above + separator + below elif self.getOption('force'): - pywikibot.output(u"Page %s already exists, ***overwriting!" - % title) + pywikibot.output('Page {0} already exists, ***overwriting!' + .format(title)) comment = comment_force else: - pywikibot.output('Page %s already exists, not adding!' % title) + pywikibot.output('Page {0} already exists, not adding!' + .format(title)) return else: if self.getOption('autosummary'): @@ -224,7 +227,7 @@ def __iter__(self): """Read file and yield a tuple of page title and content.""" - pywikibot.output('\n\nReading \'%s\'...' % self.filename) + pywikibot.output("\n\nReading '{0}'...".format(self.filename)) try: with codecs.open(self.filename, 'r', encoding=config.textfile_encoding) as f: @@ -241,12 +244,12 @@ length, title, contents = self.findpage(text[position:]) except AttributeError: if not length: - pywikibot.output(u'\nStart or end marker not found.') + pywikibot.output('\nStart or end marker not found.') else: - pywikibot.output(u'End of file.') + pywikibot.output('End of file.') break except NoTitle as err: - pywikibot.output(u'\nNo title found - skipping a page.') + pywikibot.output('\nNo title found - skipping a page.') position += err.offset continue if length == 0: @@ -324,11 +327,11 @@ elif option in ('nocontent', 'summary'): options[option] = value else: - pywikibot.output(u"Disregarding unknown argument %s." % arg) + pywikibot.output('Disregarding unknown argument {0}.'.format(arg)) failed_filename = False while not os.path.isfile(filename): - pywikibot.output('\nFile \'%s\' does not exist. ' % filename) + pywikibot.output("\nFile '{0}' does not exist. ".format(filename)) _input = pywikibot.input( 'Please enter the file name [q to quit]:') if _input == 'q': @@ -348,5 +351,5 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462448 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: I8610b993b8016162c7378313825431ad312df55c Gerrit-Change-Number: 462448 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/newitem.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462463 ) Change subject: [cleanup] cleanup scripts/newitem.py ...................................................................... [cleanup] cleanup scripts/newitem.py - remove preleading "u" fron 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: I84b6e27a75eed4f111e423d3a18db408fcbfc06a --- M scripts/newitem.py 1 file changed, 15 insertions(+), 13 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/newitem.py b/scripts/newitem.py index aab642f..64e3360 100755 --- a/scripts/newitem.py +++ b/scripts/newitem.py @@ -56,9 +56,9 @@ days=self.pageAge) self.lastEditBefore = self.repo.getcurrenttime() - timedelta( days=self.lastEdit) - pywikibot.output('Page age is set to %s days so only pages created' - '\nbefore %s will be considered.' - % (self.pageAge, self.pageAgeBefore.isoformat())) + pywikibot.output('Page age is set to {0} days so only pages created' + '\nbefore {1} will be considered.' + .format(self.pageAge, self.pageAgeBefore.isoformat())) pywikibot.output( 'Last edit is set to {0} days so only pages last edited' '\nbefore {1} will be considered.'.format( @@ -85,34 +85,36 @@ def treat_page_and_item(self, page, item): """Treat page/item.""" if item and item.exists(): - pywikibot.output(u'%s already has an item: %s.' % (page, item)) + pywikibot.output('{0} already has an item: {1}.' + .format(page, item)) if self.getOption('touch'): - pywikibot.output(u'Doing a null edit on the page.') + pywikibot.output('Doing a null edit on the page.') self._touch_page(page) return if page.isRedirectPage(): - pywikibot.output(u'%s is a redirect page. Skipping.' % page) + pywikibot.output('{0} is a redirect page. Skipping.'.format(page)) return if page.editTime() > self.lastEditBefore: pywikibot.output( - u'Last edit on %s was on %s.\nToo recent. Skipping.' - % (page, page.editTime().isoformat())) + 'Last edit on {0} was on {1}.\nToo recent. Skipping.' + .format(page, page.editTime().isoformat())) return if page.oldest_revision.timestamp > self.pageAgeBefore: pywikibot.output( - u'Page creation of %s on %s is too recent. Skipping.' - % (page, page.editTime().isoformat())) + 'Page creation of {0} on {1} is too recent. Skipping.' + .format(page, page.editTime().isoformat())) return if page.isCategoryRedirect(): - pywikibot.output('%s is a category redirect. Skipping.' % page) + pywikibot.output('{0} is a category redirect. Skipping.' + .format(page)) return if page.langlinks(): # FIXME: Implement this pywikibot.output( - "Found language links (interwiki links).\n" + 'Found language links (interwiki links).\n' "Haven't implemented that yet so skipping.") return @@ -155,5 +157,5 @@ return True -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462463 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: I84b6e27a75eed4f111e423d3a18db408fcbfc06a Gerrit-Change-Number: 462463 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/ndashredir.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462466 ) Change subject: [cleanup] cleanup scripts/ndashredir.py ...................................................................... [cleanup] cleanup scripts/ndashredir.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: I9f0d0409495b4c2e6280be886b1fabe94576e974 --- M scripts/ndashredir.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/ndashredir.py b/scripts/ndashredir.py index 86dd098..7339090 100644 --- a/scripts/ndashredir.py +++ b/scripts/ndashredir.py @@ -91,8 +91,8 @@ # skip unchanged if redir.title() == origin: - pywikibot.output('No need to process %s, skipping…' - % redir.title()) + pywikibot.output('No need to process {0}, skipping...' + .format(redir.title())) # suggest -reversed parameter if '-' in origin and not self.getOption('reversed'): pywikibot.output('Consider using -reversed parameter ' @@ -100,13 +100,13 @@ else: # skip existing if redir.exists(): - pywikibot.output('%s already exists, skipping…' - % redir.title()) + pywikibot.output('{0} already exists, skipping...' + .format(redir.title())) else: # confirm and save redirect if self.user_confirm( color_format( - 'Redirect from {lightblue}{0}{default} doesn\'t exist ' + "Redirect from {lightblue}{0}{default} doesn't exist " 'yet.\nDo you want to create it?', redir.title())): # If summary option is None, it takes the default -- To view, visit https://gerrit.wikimedia.org/r/462466 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: I9f0d0409495b4c2e6280be886b1fabe94576e974 Gerrit-Change-Number: 462466 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/nowcommons.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462453 ) Change subject: [cleanup] cleanup scripts/nowcommons.py ...................................................................... [cleanup] cleanup scripts/nowcommons.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: Ief97641ad0010fd26e0cf56eb3c660abacedb3b5 --- M scripts/nowcommons.py 1 file changed, 77 insertions(+), 75 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index 0587af0..7500f07 100755 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -69,98 +69,98 @@ nowCommons = { '_default': [ - u'NowCommons' + 'NowCommons' ], 'ar': [ - u'الآن كومنز', - u'الآن كومونز', + 'الآن كومنز', + 'الآن كومونز', ], 'de': [ - u'NowCommons', - u'NC', - u'Nowcommons', + 'NowCommons', + 'NC', + 'Nowcommons', 'Now Commons', - u'NowCommons/Mängel', + 'NowCommons/Mängel', 'NC/M', ], 'en': [ - u'NowCommons', - u'Ncd', + 'NowCommons', + 'Ncd', ], 'eo': [ - u'Nun en komunejo', - u'NowCommons', + 'Nun en komunejo', + 'NowCommons', ], 'fa': [ - u'موجود در انبار', - u'NowCommons', + 'موجود در انبار', + 'NowCommons', ], 'fr': [ - u'Image sur Commons', - u'DoublonCommons', - u'Déjà sur Commons', - u'Maintenant sur commons', - u'Désormais sur Commons', - u'NC', - u'NowCommons', - u'Nowcommons', - u'Sharedupload', - u'Sur Commons', - u'Sur Commons2', + 'Image sur Commons', + 'DoublonCommons', + 'Déjà sur Commons', + 'Maintenant sur commons', + 'Désormais sur Commons', + 'NC', + 'NowCommons', + 'Nowcommons', + 'Sharedupload', + 'Sur Commons', + 'Sur Commons2', ], 'he': [ - u'גם בוויקישיתוף' + 'גם בוויקישיתוף' ], 'hu': [ - u'Azonnali-commons', - u'NowCommons', - u'Nowcommons', - u'NC' + 'Azonnali-commons', + 'NowCommons', + 'Nowcommons', + 'NC' ], 'ia': [ - u'OraInCommons' + 'OraInCommons' ], 'it': [ - u'NowCommons', + 'NowCommons', ], 'ja': [ - u'NowCommons', + 'NowCommons', ], 'ko': [ - u'공용중복', - u'공용 중복', - u'NowCommons', - u'Now Commons', - u'Nowcommons', + '공용중복', + '공용 중복', + 'NowCommons', + 'Now Commons', + 'Nowcommons', ], 'nds-nl': [ - u'NoenCommons', - u'NowCommons', + 'NoenCommons', + 'NowCommons', ], 'nl': [ - u'NuCommons', - u'Nucommons', - u'NowCommons', - u'Nowcommons', - u'NCT', - u'Nct', + 'NuCommons', + 'Nucommons', + 'NowCommons', + 'Nowcommons', + 'NCT', + 'Nct', ], 'ro': [ - u'NowCommons' + 'NowCommons' ], 'ru': [ - u'NowCommons', - u'NCT', - u'Nowcommons', - u'Now Commons', - u'Db-commons', - u'Перенесено на Викисклад', - u'На Викискладе', + 'NowCommons', + 'NCT', + 'Nowcommons', + 'Now Commons', + 'Db-commons', + 'Перенесено на Викисклад', + 'На Викискладе', ], 'zh': [ - u'NowCommons', - u'Nowcommons', - u'NCT', + 'NowCommons', + 'Nowcommons', + 'NCT', ], } @@ -265,15 +265,15 @@ try: localImagePage = pywikibot.FilePage(self.site, page.title()) if localImagePage.fileIsShared(): - pywikibot.output(u'File is already on Commons.') + pywikibot.output('File is already on Commons.') continue sha1 = localImagePage.latest_file_info.sha1 filenameOnCommons = self.findFilenameOnCommons(localImagePage) if not filenameOnCommons: - pywikibot.output(u'NowCommons template not found.') + pywikibot.output('NowCommons template not found.') continue - commonsImagePage = pywikibot.FilePage(commons, 'Image:%s' - % filenameOnCommons) + commonsImagePage = pywikibot.FilePage(commons, 'Image:' + + filenameOnCommons) if (localImagePage.title(with_ns=False) != commonsImagePage.title(with_ns=False)): usingPages = list(localImagePage.usingPages()) @@ -314,7 +314,7 @@ self.site, page.title()).usingPages())) else: - pywikibot.output(u'Please change them manually.') + pywikibot.output('Please change them manually.') continue else: pywikibot.output(color_format( @@ -325,7 +325,7 @@ if self.getOption('replaceonly') is False: if sha1 == commonsImagePage.latest_file_info.sha1: pywikibot.output( - u'The image is identical to the one on Commons.') + 'The image is identical to the one on Commons.') if len(localImagePage.getFileVersionHistory()) > 1: pywikibot.output( 'This image has a version history. Please ' @@ -342,28 +342,30 @@ commonsImagePage.title()) pywikibot.output(commonsText) if pywikibot.input_yn( - u'Does the description on Commons contain ' + 'Does the description on Commons contain ' 'all required source and license\n' 'information?', default=False, automatic_quit=False): localImagePage.delete( - '%s [[:commons:Image:%s]]' - % (comment, filenameOnCommons), prompt=False) + '{0} [[:commons:Image:{1}]]' + .format(comment, filenameOnCommons), + prompt=False) else: localImagePage.delete( - comment + ' [[:commons:Image:%s]]' - % filenameOnCommons, prompt=False) + comment + ' [[:commons:Image:{0}]]' + .format(filenameOnCommons), + prompt=False) else: - pywikibot.output( - u'The image is not identical to the one on Commons.') + pywikibot.output('The image is not identical to ' + 'the one on Commons.') except (pywikibot.NoPage, pywikibot.IsRedirectPage) as e: - pywikibot.output(u'%s' % e[0]) + pywikibot.output('{0}'.format(e[0])) continue else: self._treat_counter += 1 if not self._treat_counter: - pywikibot.output( - 'No transcluded files found for %s.' % self.ncTemplates()[0]) + pywikibot.output('No transcluded files found for {0}.' + .format(self.ncTemplates()[0])) self.exit() @@ -386,8 +388,8 @@ raise NotImplementedError( "The '-hash' argument is not implemented anymore.") elif arg == '-autonomous': - pywikibot.warning(u"The '-autonomous' argument is DEPRECATED," - u" use '-always' instead.") + pywikibot.warning("The '-autonomous' argument is DEPRECATED," + " use '-always' instead.") options['always'] = True elif arg.startswith('-'): if arg[1:] in ('always', 'replace', 'replaceloose', 'replaceonly'): @@ -397,5 +399,5 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462453 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: Ief97641ad0010fd26e0cf56eb3c660abacedb3b5 Gerrit-Change-Number: 462453 Gerrit-PatchSet: 1 Gerrit-Owner: 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/replicate_wiki.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462402 ) Change subject: [cleanup] cleanup scripts/replicate_wiki.py ...................................................................... [cleanup] cleanup scripts/replicate_wiki.py - use single quotes for string literals - use str.format(...) instead of modulo for type specifier arguments - use "+" for appending strings in some cases Change-Id: I0a988afaa401cd689b7cc8c0eb1c2cbaa8a0495f --- M scripts/replicate_wiki.py 1 file changed, 26 insertions(+), 24 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py index a4d75dd..3b803e1 100755 --- a/scripts/replicate_wiki.py +++ b/scripts/replicate_wiki.py @@ -82,7 +82,7 @@ else: original_wiki = config.mylang - pywikibot.output("Syncing from " + original_wiki) + pywikibot.output('Syncing from ' + original_wiki) family = config.family @@ -138,14 +138,15 @@ if self.options.namespace: pywikibot.output(str(self.options.namespace)) namespaces = [int(self.options.namespace)] - pywikibot.output("Checking these namespaces: %s\n" % (namespaces,)) + pywikibot.output('Checking these namespaces: {0}\n' + .format((namespaces,))) for ns in namespaces: self.check_namespace(ns) def check_namespace(self, namespace): """Check an entire namespace.""" - pywikibot.output("\nCHECKING NAMESPACE %s" % namespace) + pywikibot.output('\nCHECKING NAMESPACE {0}'.format(namespace)) pages = (p.title() for p in self.original.allpages( '!', namespace=namespace)) for p in pages: @@ -165,18 +166,19 @@ """Create page on wikis with overview of bot results.""" for site in self.sites: sync_overview_page = Page(site, - 'User:%s/sync.py overview' % site.user()) - output = "== Pages that differ from original ==\n\n" + 'User:{0}/sync.py overview' + .format(site.user())) + output = '== Pages that differ from original ==\n\n' if self.differences[site]: - output += "".join('* [[:%s]]\n' % l for l in + output += ''.join('* [[:%s]]\n' % l for l in self.differences[site]) else: - output += "All important pages are the same" + output += 'All important pages are the same' output += ( '\n\n== Admins from original that are missing here ==\n\n') if self.user_diff[site]: - output += "".join('* %s\n' % l.replace('_', ' ') for l in + output += ''.join('* %s\n' % l.replace('_', ' ') for l in self.user_diff[site]) else: output += ( @@ -188,12 +190,12 @@ def put_message(self, site): """Return synchonization message.""" - return ('%s replicate_wiki.py synchronization from %s' - % (site.user(), str(self.original))) + return ('{0} replicate_wiki.py synchronization from {1}' + .format(site.user(), str(self.original))) def check_page(self, pagename): """Check one page.""" - pywikibot.output("\nChecking %s" % pagename) + pywikibot.output('\nChecking ' + pagename) sys.stdout.flush() page1 = Page(self.original, pagename) txt1 = page1.text @@ -206,8 +208,8 @@ for site in self.sites: if dest_ns is not None: page2 = Page(site, page1.title(with_ns=False), dest_ns) - pywikibot.output("\nCross namespace, new title: %s" - % page2.title()) + pywikibot.output('\nCross namespace, new title: ' + + page2.title()) else: page2 = Page(site, pagename) @@ -222,11 +224,11 @@ if txt1 != txt_new: pywikibot.output( 'NOTE: text replaced using config.sync_replace') - pywikibot.output('%s %s %s' % (txt1, txt_new, txt2)) + pywikibot.output('{0} {1} {2}'.format(txt1, txt_new, txt2)) txt1 = txt_new if txt1 != txt2: - pywikibot.output("\n %s DIFFERS" % site) + pywikibot.output('\n {0} DIFFERS'.format(site)) self.differences[site].append(pagename) if self.options.replace: @@ -249,17 +251,17 @@ my_args = pywikibot.handle_args(args) parser = ArgumentParser(add_help=False) - parser.add_argument("-r", "--replace", action="store_true", - help="actually replace pages (without this " - "option you will only get an overview page)") - parser.add_argument("-o", "--original", dest="original_wiki", - help="original wiki") + parser.add_argument('-r', '--replace', action='store_true', + help='actually replace pages (without this ' + 'option you will only get an overview page)') + parser.add_argument('-o', '--original', dest='original_wiki', + help='original wiki') parser.add_argument('destination_wiki', metavar='destination', type=str, nargs='+', help='destination wiki(s)') - parser.add_argument("-ns", "--namespace", dest="namespace", - help="specify namespace") - parser.add_argument("-dns", "--dest-namespace", dest="dest_namespace", - help="destination namespace (if different)") + parser.add_argument('-ns', '--namespace', dest='namespace', + help='specify namespace') + parser.add_argument('-dns', '--dest-namespace', dest='dest_namespace', + help='destination namespace (if different)') options = parser.parse_args(my_args) -- To view, visit https://gerrit.wikimedia.org/r/462402 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: I0a988afaa401cd689b7cc8c0eb1c2cbaa8a0495f Gerrit-Change-Number: 462402 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/protect.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462434 ) Change subject: [cleanup] cleanup scripts/protect.py ...................................................................... [cleanup] cleanup scripts/protect.py - remove preleading "u" from strings - use str.format(...) instead of modulo for type specifier arguments Change-Id: I78b87e2e7e2774a754fd0f88e2f6f2f8d3a822d0 --- M scripts/protect.py 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/protect.py b/scripts/protect.py index e8e0f8a..66988f8 100755 --- a/scripts/protect.py +++ b/scripts/protect.py @@ -105,8 +105,8 @@ """ self.current_page = page if not self.user_confirm( - 'Do you want to change the protection level of %s?' - % page.title(as_link=True, force_interwiki=True)): + 'Do you want to change the protection level of {0}?' + .format(page.title(as_link=True, force_interwiki=True))): return applicable = page.applicable_protections() protections = dict( @@ -136,8 +136,9 @@ num += 1 if level == default: default_char = first_char[-1] - choice = pywikibot.input_choice('Choice a protection level to %s:' - % operation, zip(levels, first_char), + choice = pywikibot.input_choice('Choice a protection level to {0}:' + .format(operation), + zip(levels, first_char), default=default_char) return levels[first_char.index(choice)] @@ -258,7 +259,7 @@ combined_protections[p_type] = level if not options.get('summary'): options['summary'] = pywikibot.input( - u'Enter a reason for the protection change:') + 'Enter a reason for the protection change:') bot = ProtectionRobot(generator, combined_protections, site, **options) bot.run() return True -- To view, visit https://gerrit.wikimedia.org/r/462434 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: I78b87e2e7e2774a754fd0f88e2f6f2f8d3a822d0 Gerrit-Change-Number: 462434 Gerrit-PatchSet: 2 Gerrit-Owner: 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] clean scripts/reflinks.py
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462409 ) Change subject: [cleanup] clean scripts/reflinks.py ...................................................................... [cleanup] clean scripts/reflinks.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 - use "+" to concatenate strings in some cases Change-Id: I04354e9c14c16dcc713a62d841314dd9d911330a --- M scripts/reflinks.py 1 file changed, 80 insertions(+), 78 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/reflinks.py b/scripts/reflinks.py index ef86f97..41e3b2a 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -82,34 +82,34 @@ stop_page = { - 'fr': u'Utilisateur:DumZiBoT/EditezCettePagePourMeStopper', - 'da': u'Bruger:DumZiBoT/EditThisPageToStopMe', - 'de': u'Benutzer:DumZiBoT/EditThisPageToStopMe', - 'fa': u'کاربر:Amirobot/EditThisPageToStopMe', - 'it': u'Utente:Marco27Bot/EditThisPageToStopMe', - 'ko': u'사용자:GrassnBreadRefBot/EditThisPageToStopMe1', - 'he': u'User:Matanyabot/EditThisPageToStopMe', - 'hu': u'User:Damibot/EditThisPageToStopMe', - 'en': u'User:DumZiBoT/EditThisPageToStopMe', - 'pl': u'Wikipedysta:MastiBot/EditThisPageToStopMe', - 'ru': u'User:Rubinbot/EditThisPageToStopMe', + 'fr': 'Utilisateur:DumZiBoT/EditezCettePagePourMeStopper', + 'da': 'Bruger:DumZiBoT/EditThisPageToStopMe', + 'de': 'Benutzer:DumZiBoT/EditThisPageToStopMe', + 'fa': 'کاربر:Amirobot/EditThisPageToStopMe', + 'it': 'Utente:Marco27Bot/EditThisPageToStopMe', + 'ko': '사용자:GrassnBreadRefBot/EditThisPageToStopMe1', + 'he': 'User:Matanyabot/EditThisPageToStopMe', + 'hu': 'User:Damibot/EditThisPageToStopMe', + 'en': 'User:DumZiBoT/EditThisPageToStopMe', + 'pl': 'Wikipedysta:MastiBot/EditThisPageToStopMe', + 'ru': 'User:Rubinbot/EditThisPageToStopMe', 'ur': 'صارف:Shuaib-bot/EditThisPageToStopMe', - 'zh': u'User:Sz-iwbot', + 'zh': 'User:Sz-iwbot', } deadLinkTag = { - 'fr': u'[%s] {{lien mort}}', - 'da': u'[%s] {{dødt link}}', - 'fa': u'[%s] {{پیوند مرده}}', - 'he': u'{{קישור שבור}}', + 'fr': '[%s] {{lien mort}}', + 'da': '[%s] {{dødt link}}', + 'fa': '[%s] {{پیوند مرده}}', + 'he': '{{קישור שבור}}', 'hi': '[%s] {{Dead link}}', - 'hu': u'[%s] {{halott link}}', - 'ko': u'[%s] {{죽은 바깥 고리}}', - 'es': u'{{enlace roto2|%s}}', - 'it': u'{{Collegamento interrotto|%s}}', - 'en': u'[%s] {{dead link}}', - 'pl': u'[%s] {{Martwy link}}', - 'ru': u'[%s] {{subst:dead}}', + 'hu': '[%s] {{halott link}}', + 'ko': '[%s] {{죽은 바깥 고리}}', + 'es': '{{enlace roto2|%s}}', + 'it': '{{Collegamento interrotto|%s}}', + 'en': '[%s] {{dead link}}', + 'pl': '[%s] {{Martwy link}}', + 'ru': '[%s] {{subst:dead}}', 'sr': '[%s] {{dead link}}', 'ur': '[%s] {{مردہ ربط}}', } @@ -170,7 +170,7 @@ 'fr': '.*(404|page|site).*en +travaux.*', 'es': '.*sitio.*no +disponible.*', 'it': '((pagina|sito) (non trovat[ao]|inesistente)|accedi|errore)', - 'ru': u'.*(Страница|страница).*(не[ ]*найдена|осутствует).*', + 'ru': '.*(Страница|страница).*(не[ ]*найдена|осутствует).*', } # Regex that match bare references @@ -202,7 +202,7 @@ self.link = link self.site = site or pywikibot.Site() self.linkComment = i18n.twtranslate(self.site, 'reflinks-comment') - self.url = re.sub(u'#.*', '', self.link) + self.url = re.sub('#.*', '', self.link) self.title = None def refTitle(self): @@ -337,7 +337,7 @@ if name not in found_ref_names: # first time ever we meet this name if name == 'population': - pywikibot.output("in") + pywikibot.output('in') v[2] = quoted v[0] = name else: @@ -352,20 +352,20 @@ id += 1 for (g, d) in found_refs.items(): if g: - group = u"group=\"%s\" " % group + group = 'group=\"{0}\" '.format(group) else: - group = u"" + group = '' for (k, v) in d.items(): if len(v[1]) == 1 and not v[3]: continue name = v[0] if not name: - name = '"%s%d"' % (self.autogen, id) + name = '"{0}{1}"'.format(self.autogen, id) id += 1 elif v[2]: - name = u'"%s"' % name - named = u'<ref %sname=%s>%s</ref>' % (group, name, k) + name = '"{0}"'.format(name) + named = '<ref {0}name={1}>{2}</ref>'.format(group, name, k) text = text.replace(v[1][0], named, 1) # make sure that the first (named ref) is not @@ -374,7 +374,7 @@ header = text[:pos] end = text[pos:] - unnamed = u'<ref %sname=%s />' % (group, name) + unnamed = '<ref {0}name={1} />'.format(group, name) for ref in v[1][1:]: end = end.replace(ref, unnamed) text = header + end @@ -383,11 +383,11 @@ # TODO : Support ref groups name = v[0] if v[1]: - name = u'"%s"' % name + name = '"{0}"'.format(name) text = re.sub( '<ref name\\s*=\\s*(?P<quote>"?)\\s*{}\\s*(?P=quote)\\s*/>' .format(k), - u'<ref name=%s />' % name, text) + '<ref name={} />'.format(name), text) return text @@ -416,7 +416,7 @@ code = alt break if code: - manual += '/%s' % code + manual += '/{0}'.format(code) if self.getOption('summary') is None: self.msg = i18n.twtranslate(self.site, 'reflinks-msg', locals()) else: @@ -437,8 +437,8 @@ if self.stop_page.exists(): self.stop_page_rev_id = self.stop_page.latest_revision_id else: - pywikibot.warning('The stop page %s does not exist' - % self.stop_page.title(as_link=True)) + pywikibot.warning('The stop page {0} does not exist' + .format(self.stop_page.title(as_link=True))) # Regex to grasp content-type meta HTML tag in HTML source self.META_CONTENT = re.compile(br'(?i)<meta[^>]*content\-type[^>]*>') @@ -466,13 +466,13 @@ FIXME: Unix-only, I'm afraid. """ - pywikibot.output(u'PDF file.') + pywikibot.output('PDF file.') fd, infile = tempfile.mkstemp() urlobj = os.fdopen(fd, 'w+') urlobj.write(f.text) try: - pdfinfo_out = subprocess.Popen([r"pdfinfo", "/dev/stdin"], + pdfinfo_out = subprocess.Popen([r'pdfinfo', '/dev/stdin'], stdin=urlobj, stdout=subprocess.PIPE, stderr=subprocess.PIPE, @@ -482,14 +482,14 @@ ref.title = aline.split(None)[1:] ref.title = ' '.join(ref.title) if ref.title != '': - pywikibot.output(u'title: %s' % ref.title) - pywikibot.output(u'PDF done.') + pywikibot.output('title: ' + ref.title) + pywikibot.output('PDF done.') except ValueError: - pywikibot.output(u'pdfinfo value error.') + pywikibot.output('pdfinfo value error.') except OSError: - pywikibot.output(u'pdfinfo OS error.') + pywikibot.output('pdfinfo OS error.') except Exception: # Ignore errors - pywikibot.output(u'PDF processing error.') + pywikibot.output('PDF processing error.') pywikibot.exception() finally: urlobj.close() @@ -512,26 +512,26 @@ # Load the page's text from the wiki new_text = page.get() if not page.canBeEdited(): - pywikibot.output(u"You can't edit page %s" - % page.title(as_link=True)) + pywikibot.output("You can't edit page " + + page.title(as_link=True)) continue except pywikibot.NoPage: pywikibot.output('Page {} not found' .format(page.title(as_link=True))) continue except pywikibot.IsRedirectPage: - pywikibot.output(u'Page %s is a redirect' - % page.title(as_link=True)) + pywikibot.output('Page {} is a redirect' + .format(page.title(as_link=True))) continue # for each link to change for match in linksInRef.finditer( textlib.removeDisabledParts(page.get())): - link = match.group(u'url') + link = match.group('url') # debugging purpose # print link - if u'jstor.org' in link: + if 'jstor.org' in link: # TODO: Clean URL blacklist continue @@ -555,7 +555,7 @@ 'media : {0} ', ref.link)) if ref.title: if not re.match( - u'(?i) *microsoft (word|excel|visio)', + '(?i) *microsoft (word|excel|visio)', ref.title): ref.transform(ispdf=True) repl = ref.refTitle() @@ -582,14 +582,14 @@ if dirIndex.match(redir) and \ not dirIndex.match(ref.link): pywikibot.output(color_format( - u'{lightyellow}WARNING{default} : ' - u'Redirect to root : {0} ', ref.link)) + '{lightyellow}WARNING{default} : ' + 'Redirect to root : {0} ', ref.link)) continue if f.status != requests.codes.ok: - pywikibot.output(u'HTTP error (%s) for %s on %s' - % (f.status, ref.url, - page.title(as_link=True)), + pywikibot.output('HTTP error ({0}) for {1} on {2}' + .format(f.status, ref.url, + page.title(as_link=True)), toStdout=True) # 410 Gone, indicates that the resource has been # purposely removed @@ -615,8 +615,8 @@ httplib.error, pywikibot.FatalServerError, pywikibot.Server504Error) as e: - pywikibot.output(u'Can\'t retrieve page %s : %s' - % (ref.url, e)) + pywikibot.output("Can't retrieve page {0} : {1}" + .format(ref.url, e)) continue # remove <script>/<style>/comments/CDATA tags @@ -650,9 +650,9 @@ else: enc.append(tmp) else: - pywikibot.output(u'No charset found for %s' % ref.link) + pywikibot.output('No charset found for ' + ref.link) if not content_type: - pywikibot.output('No content-type found for %s' % ref.link) + pywikibot.output('No content-type found for ' + ref.link) continue elif not self.MIME.search(content_type): pywikibot.output(color_format( @@ -665,18 +665,18 @@ # Ugly hacks to try to survive when both server and page # return no encoding. # Uses most used encodings for each national suffix - if u'.ru' in ref.link or u'.su' in ref.link: + if '.ru' in ref.link or '.su' in ref.link: # see http://www.sci.aha.ru/ATL/ra13a.htm : no server # encoding, no page encoding enc = enc + ['koi8-r', 'windows-1251'] - elif u'.jp' in ref.link: - enc.append("shift jis 2004") - enc.append("cp932") - elif u'.kr' in ref.link: - enc.append("euc-kr") - enc.append("cp949") - elif u'.zh' in ref.link: - enc.append("gbk") + elif '.jp' in ref.link: + enc.append('shift jis 2004') + enc.append('cp932') + elif '.kr' in ref.link: + enc.append('euc-kr') + enc.append('cp949') + elif '.zh' in ref.link: + enc.append('gbk') if 'utf-8' not in enc: enc.append('utf-8') @@ -699,14 +699,16 @@ if not ref.title: repl = ref.refLink() new_text = new_text.replace(match.group(), repl) - pywikibot.output(u'%s : No title found...' % ref.link) + pywikibot.output('{0} : No title found...' + .format(ref.link)) continue # XXX Ugly hack - if u'Ã©' in ref.title: + if 'Ã©' in ref.title: repl = ref.refLink() new_text = new_text.replace(match.group(), repl) - pywikibot.output(u'%s : Hybrid encoding...' % ref.link) + pywikibot.output('{0} : Hybrid encoding...' + .format(ref.link)) continue if self.titleBlackList.match(ref.title): @@ -719,7 +721,7 @@ # Truncate long titles. 175 is arbitrary if len(ref.title) > 175: - ref.title = ref.title[:175] + "..." + ref.title = ref.title[:175] + '...' repl = ref.refTitle() new_text = new_text.replace(match.group(), repl) @@ -755,8 +757,8 @@ actual_rev = self.stop_page.latest_revision_id if actual_rev != self.stop_page_rev_id: pywikibot.output( - '%s has been edited : Someone wants us to stop.' - % self.stop_page.title(as_link=True)) + '{0} has been edited : Someone wants us to stop.' + .format(self.stop_page.title(as_link=True))) return @@ -790,13 +792,13 @@ elif arg.startswith('-xmlstart'): if len(arg) == 9: xml_start = pywikibot.input( - u'Please enter the dumped article to start with:') + 'Please enter the dumped article to start with:') else: xml_start = arg[10:] elif arg.startswith('-xml'): if len(arg) == 4: xml_filename = pywikibot.input( - u'Please enter the XML dump\'s filename:') + "Please enter the XML dump's filename:") else: xml_filename = arg[5:] else: @@ -818,5 +820,5 @@ return True -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462409 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: I04354e9c14c16dcc713a62d841314dd9d911330a Gerrit-Change-Number: 462409 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)

1 0

[Gerrit] pywikibot/core[master]: Move methods for simple claim adding/removing to WikibasePage
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/447390 ) Change subject: Move methods for simple claim adding/removing to WikibasePage ...................................................................... Move methods for simple claim adding/removing to WikibasePage This object already assumes in WikibasePage.get() that all WikibasePage instances have claims. This is the case for items, properties and also upcoming lexemes and mediainfo entities. Bug: T113131 Change-Id: Iea1c82e47328588aa7f44fa3364c538d689c0cd3 --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 49 insertions(+), 48 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 1a67eeb..dba0e7d 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4230,6 +4230,46 @@ """ raise NotImplementedError + @allow_asynchronous + def addClaim(self, claim, bot=True, **kwargs): + """ + Add a claim to the entity. + + @param claim: The claim to add + @type claim: Claim + @param bot: Whether to flag as bot (if possible) + @type bot: bool + @keyword asynchronous: if True, launch a separate thread to add claim + asynchronously + @type asynchronous: bool + @keyword callback: a callable object that will be called after the + claim has been added. It must take two arguments: + (1) a WikibasePage object, and (2) an exception instance, + which will be None if the entity was saved successfully. This is + intended for use by bots that need to keep track of which saves + were successful. + @type callback: callable + """ + self.repo.addClaim(self, claim, bot=bot, **kwargs) + claim.on_item = self + + def removeClaims(self, claims, **kwargs): + """ + Remove the claims from the entity. + + @param claims: list of claims to be removed + @type claims: list or pywikibot.Claim + """ + # this check allows single claims to be removed by pushing them into a + # list of length one. + if isinstance(claims, pywikibot.Claim): + claims = [claims] + data = self.repo.removeClaims(claims, **kwargs) + for claim in claims: + claim.on_item.latest_revision_id = data['pageinfo']['lastrevid'] + claim.on_item = None + claim.snak = None + class ItemPage(WikibasePage): @@ -4534,45 +4574,6 @@ data = {'sitelinks': data} self.editEntity(data, **kwargs) - @allow_asynchronous - def addClaim(self, claim, bot=True, **kwargs): - """ - Add a claim to the item. - - @param claim: The claim to add - @type claim: Claim - @param bot: Whether to flag as bot (if possible) - @type bot: bool - @keyword asynchronous: if True, launch a separate thread to add claim - asynchronously - @type asynchronous: bool - @keyword callback: a callable object that will be called after the - claim has been added. It must take two arguments: (1) an ItemPage - object, and (2) an exception instance, which will be None if the - item was saved successfully. This is intended for use by bots that - need to keep track of which saves were successful. - @type callback: callable - """ - self.repo.addClaim(self, claim, bot=bot, **kwargs) - claim.on_item = self - - def removeClaims(self, claims, **kwargs): - """ - Remove the claims from the item. - - @param claims: list of claims to be removed - @type claims: list or pywikibot.Claim - """ - # this check allows single claims to be removed by pushing them into a - # list of length one. - if isinstance(claims, pywikibot.Claim): - claims = [claims] - data = self.repo.removeClaims(claims, **kwargs) - for claim in claims: - claim.on_item.latest_revision_id = data['pageinfo']['lastrevid'] - claim.on_item = None - claim.snak = None - def mergeInto(self, item, **kwargs): """ Merge the item into another item. diff --git a/pywikibot/site.py b/pywikibot/site.py index ea6c6b3..db1569d 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -7719,12 +7719,12 @@ return data @must_be(group='user') - def addClaim(self, item, claim, bot=True, summary=None): + def addClaim(self, entity, claim, bot=True, summary=None): """ Add a claim. - @param item: Entity to modify - @type item: WikibasePage + @param entity: Entity to modify + @type entity: WikibasePage @param claim: Claim to be added @type claim: pywikibot.Claim @param bot: Whether to mark the edit as a bot edit @@ -7732,8 +7732,8 @@ @param summary: Edit summary @type summary: str """ - params = {'action': 'wbcreateclaim', 'entity': item.getID(), - 'baserevid': item.latest_revision_id, + params = {'action': 'wbcreateclaim', 'entity': entity.getID(), + 'baserevid': entity.latest_revision_id, 'snaktype': claim.getSnakType(), 'property': claim.getID(), 'summary': summary, 'bot': bot} @@ -7745,11 +7745,11 @@ data = req.submit() claim.snak = data['claim']['id'] # Update the item - if claim.getID() in item.claims: - item.claims[claim.getID()].append(claim) + if claim.getID() in entity.claims: + entity.claims[claim.getID()].append(claim) else: - item.claims[claim.getID()] = [claim] - item.latest_revision_id = data['pageinfo']['lastrevid'] + entity.claims[claim.getID()] = [claim] + entity.latest_revision_id = data['pageinfo']['lastrevid'] @must_be(group='user') def changeClaimTarget(self, claim, snaktype='value', -- To view, visit https://gerrit.wikimedia.org/r/447390 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: Iea1c82e47328588aa7f44fa3364c538d689c0cd3 Gerrit-Change-Number: 447390 Gerrit-PatchSet: 2 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: ArthurPSmith <arthurpsmith(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: Revert "Temporarily add vcrpy!=2.0.0 as requirement for nose-detecthttp"
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462336 ) Change subject: Revert "Temporarily add vcrpy!=2.0.0 as requirement for nose-detecthttp" ...................................................................... Revert "Temporarily add vcrpy!=2.0.0 as requirement for nose-detecthttp" This reverts commit 53a3f2033e414e741ce7be77a4cf6562c47162f3. Reason for revert: The upstream issue has been resolved.[1] [1]: https://github.com/kevin1024/vcrpy/issues/393 Bug: T205073 Change-Id: I3ed7635f9b8fed2252c4db8dce27e0d06dbe6cff --- M tox.ini 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index ac1e6e0..599af03 100644 --- a/tox.ini +++ b/tox.ini @@ -77,8 +77,6 @@ deps = nose nose-detecthttp - # Temporary requirement. Should be fixed in vcrpy or required in nose-detecthttp. - vcrpy!=2.0.0 unicodecsv mock @@ -93,8 +91,6 @@ beautifulsoup4 nose nose-detecthttp>=0.1.3 - # Temporary requirement. Should be fixed in vcrpy or required in nose-detecthttp. - vcrpy!=2.0.0 six mock -- To view, visit https://gerrit.wikimedia.org/r/462336 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: I3ed7635f9b8fed2252c4db8dce27e0d06dbe6cff Gerrit-Change-Number: 462336 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> 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: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: Revert "[tests] add check in pagegenerators_tests.TestWantedFactoryGe...
by jenkins-bot (Code Review) 24 Sep '18

24 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462332 ) Change subject: Revert "[tests] add check in pagegenerators_tests.TestWantedFactoryGenerator" ...................................................................... Revert "[tests] add check in pagegenerators_tests.TestWantedFactoryGenerator" This reverts commit 5db84a897683232d250b9beca7eb6cad575caa15. The results of this querypage are rarely updated, there is no guarantee that the page does not exist. Bug: T205233 Change-Id: I6e71023f384ac4f1b1920ce38eb8b0c879c7651a --- M tests/pagegenerators_tests.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 9d5d7a9..39b8fec 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1286,7 +1286,6 @@ pages = list(gen) self.assertLessEqual(len(pages), 5) for page in pages: - self.assertFalse(page.exists()) yield page def test_wanted_pages(self): -- To view, visit https://gerrit.wikimedia.org/r/462332 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: I6e71023f384ac4f1b1920ce38eb8b0c879c7651a Gerrit-Change-Number: 462332 Gerrit-PatchSet: 2 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/revertbot.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462318 ) Change subject: [cleanup] cleanup scripts/revertbot.py ...................................................................... [cleanup] cleanup scripts/revertbot.py - remove preleading "u" from strings - use str.format(...) instead of modulo for type specifier arguments - use single quotes for string literals Change-Id: I894f7e469b7659f50b35eb6b9908a5defce89ab8 --- M scripts/revertbot.py 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/revertbot.py b/scripts/revertbot.py index f6c4e07..cf4d0b6 100755 --- a/scripts/revertbot.py +++ b/scripts/revertbot.py @@ -79,11 +79,11 @@ if callback(item): result = self.revert(item) if result: - self.log(u'%s: %s' % (item['title'], result)) + self.log('{0}: {1}'.format(item['title'], result)) else: - self.log(u'Skipped %s' % item['title']) + self.log('Skipped {0}'.format(item['title'])) else: - self.log(u'Skipped %s by callback' % item['title']) + self.log('Skipped {0} by callback'.format(item['title'])) def callback(self, item): """Callback function.""" @@ -127,8 +127,8 @@ else: pywikibot.exception() return False - return 'The edit(s) made in %s by %s was rollbacked' % (page.title(), - self.user) + return 'The edit(s) made in {0} by {1} was rollbacked'.format( + page.title(), self.user) def log(self, msg): """Log the message msg.""" @@ -153,7 +153,7 @@ if arg.startswith('-username'): if len(arg) == 9: user = pywikibot.input( - u'Please enter username of the person you want to revert:') + 'Please enter username of the person you want to revert:') else: user = arg[10:] elif arg == '-rollback': @@ -162,5 +162,5 @@ bot.revert_contribs() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462318 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: I894f7e469b7659f50b35eb6b9908a5defce89ab8 Gerrit-Change-Number: 462318 Gerrit-PatchSet: 4 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/script_wui.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462317 ) Change subject: [cleanup] cleanup scripts/script_wui.py ...................................................................... [cleanup] cleanup scripts/script_wui.py - remove preleading "u" from strings - use single quotes for string literals - use str.format(...) instead of modulo for type specifier arguments Change-Id: I02acc2b1c95b8c3f43afe6e92e42059febf00796 --- M scripts/script_wui.py 1 file changed, 16 insertions(+), 16 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/script_wui.py b/scripts/script_wui.py index 36f2493..b327274 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -101,11 +101,11 @@ resource = None bot_config = { - 'BotName': "{username}", + 'BotName': '{username}', - 'ConfCSSshell': u'User:{username}/script_wui-shell.css', - 'ConfCSScrontab': u'User:{username}/script_wui-crontab.css', - 'ConfCSSoutput': u'User:{username}/Simulation', + 'ConfCSSshell': 'User:{username}/script_wui-shell.css', + 'ConfCSScrontab': 'User:{username}/script_wui-crontab.css', + 'ConfCSSoutput': 'User:{username}/Simulation', 'CRONMaxDelay': 5 * 60.0, # check all ~5 minutes @@ -131,7 +131,7 @@ # init environment with minimal changes (try to do as less as possible) # - Lua - - pywikibot.output(u'** Redirecting Lua print in order to catch it') + pywikibot.output('** Redirecting Lua print in order to catch it') lua.execute('__print = print') lua.execute('print = python.globals().pywikibot.output') # It may be useful in debugging to install the 'print' builtin @@ -147,24 +147,24 @@ self.refs = {self.templ: templ, self.cron: cron, } - pywikibot.output(u'** Pre-loading all relevant page contents') + pywikibot.output('** Pre-loading all relevant page contents') for item in self.refs: # First check if page is protected, reject any data if not parts = self.refs[item].title().lower().rsplit('.') if len(parts) == 1 or parts[1] not in ['.css', '.js']: - raise ValueError('%s config %s = %s is not a secure page; ' + raise ValueError('{0} config {1} = {2} is not a secure page; ' 'it should be a css or js userpage which are ' 'automatically semi-protected.' - % (self.__class__.__name__, item, - self.refs[item])) + .format(self.__class__.__name__, item, + self.refs[item])) try: self.refs[item].get(force=True) # load all page contents except pywikibot.NoPage: - pywikibot.error("The configuation page %s doesn't exists" - % self.refs[item].title(as_link=True)) + pywikibot.error("The configuation page {0} doesn't exists" + .format(self.refs[item].title(as_link=True))) raise # init background timer - pywikibot.output(u'** Starting crontab background timer thread') + pywikibot.output('** Starting crontab background timer thread') self.on_timer() def on_pubmsg(self, c, e): @@ -177,10 +177,10 @@ # test actual page against (template incl.) list page = match.group('page').decode(self.site.encoding()) if page in self.refs: - pywikibot.output(u"RELOAD: %s" % page) + pywikibot.output('RELOAD: ' + page) self.refs[page].get(force=True) # re-load (refresh) page content if page == self.templ: - pywikibot.output(u"SHELL: %s" % page) + pywikibot.output('SHELL: ' + page) self.do_check(page) def on_timer(self): @@ -227,7 +227,7 @@ # secure traceback print (from api.py submit) pywikibot.exception(tb=True) - pywikibot.warning(u"Unable to start thread") + pywikibot.warning('Unable to start thread') wiki_logger(traceback.format_exc(), self.refs[page_title], rev) @@ -242,7 +242,7 @@ # safety; default mode is safe (no writing) pywikibot.config.simulate = True - pywikibot.output(u'--- ' * 20) + pywikibot.output('--- ' * 20) buffer = StringIO() rootLogger = logging.getLogger() -- To view, visit https://gerrit.wikimedia.org/r/462317 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: I02acc2b1c95b8c3f43afe6e92e42059febf00796 Gerrit-Change-Number: 462317 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/solve_disambiguation.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462310 ) Change subject: [cleanup] cleanup scripts/solve_disambiguation.py ...................................................................... [cleanup] cleanup scripts/solve_disambiguation.py - use single quotes for string literals and double quotes with strings that consist of single quotes within them - use str.format(...) instead of modulo for type specifiers in strings - remove preleading "u" from strings - use "+" in concatenating string type specifiers in some cases Change-Id: I66cfb8b4a06e33d0a79639eaaafa9d5520b8ae85 --- M scripts/solve_disambiguation.py 1 file changed, 255 insertions(+), 253 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 686d529..5e6abb1 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -u""" +""" Script to help a human solve disambiguations by presenting a set of options. Specify the disambiguation page on the command line. @@ -103,36 +103,36 @@ # Disambiguation Needed template dn_template = { - 'en': u'{{dn}}', - 'fr': u'{{Lien vers un homonyme}}', + 'en': '{{dn}}', + 'fr': '{{Lien vers un homonyme}}', } # disambiguation page name format for "primary topic" disambiguations # (Begriffsklärungen nach Modell 2) primary_topic_format = { - 'ar': u'%s_(توضيح)', - 'ca': u'%s_(desambiguació)', - 'cs': u'%s_(rozcestník)', - 'de': u'%s_(Begriffsklärung)', - 'en': u'%s_(disambiguation)', - 'fa': u'%s_(ابهام‌زدایی)', - 'fi': u'%s_(täsmennyssivu)', - 'hu': u'%s_(egyértelműsítő lap)', - 'ia': u'%s_(disambiguation)', - 'it': u'%s_(disambigua)', - 'lt': u'%s_(reikšmės)', - 'kk': u'%s_(айрық)', - 'ko': u'%s_(동음이의)', - 'nl': u'%s_(doorverwijspagina)', - 'no': u'%s_(peker)', - 'pl': u'%s_(ujednoznacznienie)', - 'pt': u'%s_(desambiguação)', - 'pfl': u'%s_BKL', - 'he': u'%s_(פירושונים)', - 'ru': u'%s_(значения)', - 'sr': u'%s_(вишезначна одредница)', - 'sv': u'%s_(olika betydelser)', - 'uk': u'%s_(значення)', + 'ar': '%s_(توضيح)', + 'ca': '%s_(desambiguació)', + 'cs': '%s_(rozcestník)', + 'de': '%s_(Begriffsklärung)', + 'en': '%s_(disambiguation)', + 'fa': '%s_(ابهام‌زدایی)', + 'fi': '%s_(täsmennyssivu)', + 'hu': '%s_(egyértelműsítő lap)', + 'ia': '%s_(disambiguation)', + 'it': '%s_(disambigua)', + 'lt': '%s_(reikšmės)', + 'kk': '%s_(айрық)', + 'ko': '%s_(동음이의)', + 'nl': '%s_(doorverwijspagina)', + 'no': '%s_(peker)', + 'pl': '%s_(ujednoznacznienie)', + 'pt': '%s_(desambiguação)', + 'pfl': '%s_BKL', + 'he': '%s_(פירושונים)', + 'ru': '%s_(значения)', + 'sr': '%s_(вишезначна одредница)', + 'sv': '%s_(olika betydelser)', + 'uk': '%s_(значення)', 'ur': '%s_(ضد ابہام)', } @@ -144,209 +144,209 @@ ignore_title = { 'wikipedia': { 'ar': [ - u'تصنيف:صفحات توضيح', + 'تصنيف:صفحات توضيح', ], 'ca': [ - u'Viquipèdia:Enllaços incorrectes a pàgines de desambiguació', - u'Viquipèdia:Registre de pàgines de desambiguació òrfenes', - u'.*Discussió:.+', - u'.*Usuari:.+', - u'.+/[aA]rxiu.*', + 'Viquipèdia:Enllaços incorrectes a pàgines de desambiguació', + 'Viquipèdia:Registre de pàgines de desambiguació òrfenes', + '.*Discussió:.+', + '.*Usuari:.+', + '.+/[aA]rxiu.*', ], 'cs': [ - u'Wikipedie:Chybějící interwiki/.+', - u'Wikipedie:Rozcestníky', - u'Wikipedie diskuse:Rozcestníky', - u'Wikipedie:Seznam nejvíce odkazovaných rozcestníků', - u'Wikipedie:Seznam rozcestníků/první typ', - u'Wikipedie:Seznam rozcestníků/druhý typ', - u'Wikipedista:Zirland/okres', + 'Wikipedie:Chybějící interwiki/.+', + 'Wikipedie:Rozcestníky', + 'Wikipedie diskuse:Rozcestníky', + 'Wikipedie:Seznam nejvíce odkazovaných rozcestníků', + 'Wikipedie:Seznam rozcestníků/první typ', + 'Wikipedie:Seznam rozcestníků/druhý typ', + 'Wikipedista:Zirland/okres', ], 'da': [ - u'Wikipedia:Links til sider med flertydige titler' + 'Wikipedia:Links til sider med flertydige titler' ], 'de': [ - u'.+/[aA]rchiv.*', - u'.+/Baustelle.*', - u'.+/Index', - u'.+/Spielwiese', - u'.+/[tT]est.*', - u'.*Diskussion:.+', - u'Benutzer:.+/[Ll]og.*', - u'Benutzer:C.Löser/.+', - u'Benutzer:Katharina/Begriffsklärungen', - u'Benutzer:Kirschblut/.+buchstabenkürzel', - u'Benutzer:Mathias Schindler/.+', - u'Benutzer:Noisper/Dingliste/[A-Z]', - u'Benutzer:Professor Einstein.*', - u'Benutzer:Sebbot/.+', - u'Benutzer:SirJective/.+', - u'Benutzer:Srbauer.*', - u'Benutzer:SteEis.', - u'Benutzer:Steindy.*', - u'Benutzer:SrbBot.*', - u'Benutzer:PortalBot/.+', - u'Benutzer:Xqbot/.+', - u'Lehnwort', - u'Liste griechischer Wortstämme in deutschen Fremdwörtern', - u'Liste von Gräzismen', - u'Portal:Abkürzungen/.+', - u'Portal:Astronomie/Moves', - u'Portal:Astronomie/Index/.+', - u'Portal:Hund', - u'Portal:Hund/Beobachtungsliste', - u'Portal:Marxismus', - u'Portal:Täuferbewegung/Seitenindex', - u'Wikipedia:Administratoren/Anfragen', - u'Wikipedia:Archiv/.+', - u'Wikipedia:Artikelwünsche/Ding-Liste/[A-Z]', - u'Wikipedia:Begriffsklärung.*', - u'Wikipedia:Bots/.+', - u'Wikipedia:Interwiki-Konflikte', - u'Wikipedia:ISBN-Suche', - u'Wikipedia:Liste mathematischer Themen/BKS', - u'Wikipedia:Liste mathematischer Themen/Redirects', - u'Wikipedia:Meinungsbilder/.+', - u'Wikipedia:Löschkandidaten/.+', - u'Wikipedia:WikiProjekt Altertumswissenschaft/.+', - u'Wikipedia:WikiProjekt Verwaiste Seiten/Begriffsklärungen', - u'Wikipedia:Qualitätssicherung/.+', - u'Vorlage:Infobox Weltraum', - u'Vorlage:Navigationsleiste Raumfahrt', + '.+/[aA]rchiv.*', + '.+/Baustelle.*', + '.+/Index', + '.+/Spielwiese', + '.+/[tT]est.*', + '.*Diskussion:.+', + 'Benutzer:.+/[Ll]og.*', + 'Benutzer:C.Löser/.+', + 'Benutzer:Katharina/Begriffsklärungen', + 'Benutzer:Kirschblut/.+buchstabenkürzel', + 'Benutzer:Mathias Schindler/.+', + 'Benutzer:Noisper/Dingliste/[A-Z]', + 'Benutzer:Professor Einstein.*', + 'Benutzer:Sebbot/.+', + 'Benutzer:SirJective/.+', + 'Benutzer:Srbauer.*', + 'Benutzer:SteEis.', + 'Benutzer:Steindy.*', + 'Benutzer:SrbBot.*', + 'Benutzer:PortalBot/.+', + 'Benutzer:Xqbot/.+', + 'Lehnwort', + 'Liste griechischer Wortstämme in deutschen Fremdwörtern', + 'Liste von Gräzismen', + 'Portal:Abkürzungen/.+', + 'Portal:Astronomie/Moves', + 'Portal:Astronomie/Index/.+', + 'Portal:Hund', + 'Portal:Hund/Beobachtungsliste', + 'Portal:Marxismus', + 'Portal:Täuferbewegung/Seitenindex', + 'Wikipedia:Administratoren/Anfragen', + 'Wikipedia:Archiv/.+', + 'Wikipedia:Artikelwünsche/Ding-Liste/[A-Z]', + 'Wikipedia:Begriffsklärung.*', + 'Wikipedia:Bots/.+', + 'Wikipedia:Interwiki-Konflikte', + 'Wikipedia:ISBN-Suche', + 'Wikipedia:Liste mathematischer Themen/BKS', + 'Wikipedia:Liste mathematischer Themen/Redirects', + 'Wikipedia:Meinungsbilder/.+', + 'Wikipedia:Löschkandidaten/.+', + 'Wikipedia:WikiProjekt Altertumswissenschaft/.+', + 'Wikipedia:WikiProjekt Verwaiste Seiten/Begriffsklärungen', + 'Wikipedia:Qualitätssicherung/.+', + 'Vorlage:Infobox Weltraum', + 'Vorlage:Navigationsleiste Raumfahrt', ], 'en': [ - u'Wikipedia:Links to disambiguating pages', - u'Wikipedia:Disambiguation pages with links', - u'Wikipedia:Multiple-place names \$[A-Z]\$', - u'Wikipedia:Non-unique personal name', - u"User:Jerzy/Disambiguation Pages i've Editted", - u'User:Gareth Owen/inprogress', - u'TLAs from [A-Z][A-Z][A-Z] to [A-Z][A-Z][A-Z]', - u'List of all two-letter combinations', - u'User:Daniel Quinlan/redirects.+', - u'User:Oliver Pereira/stuff', - u'Wikipedia:French Wikipedia language links', - u'Wikipedia:Polish language links', - u'Wikipedia:Undisambiguated abbreviations/.+', - u'List of acronyms and initialisms', - u'Wikipedia:Usemod article histories', - u'User:Pizza Puzzle/stuff', - u'List of generic names of political parties', - u'Talk:List of initialisms/marked', - u'Talk:List of initialisms/sorted', - u'Talk:Programming language', - u'Talk:SAMPA/To do', - u"Wikipedia:Outline of Roget's Thesaurus", - u'User:Wik/Articles', - u'User:Egil/Sandbox', - u'Wikipedia talk:Make only links relevant to the context', - u'Wikipedia:Common words, searching for which is not possible', + 'Wikipedia:Links to disambiguating pages', + 'Wikipedia:Disambiguation pages with links', + 'Wikipedia:Multiple-place names \$[A-Z]\$', + 'Wikipedia:Non-unique personal name', + "User:Jerzy/Disambiguation Pages i've Editted", + 'User:Gareth Owen/inprogress', + 'TLAs from [A-Z][A-Z][A-Z] to [A-Z][A-Z][A-Z]', + 'List of all two-letter combinations', + 'User:Daniel Quinlan/redirects.+', + 'User:Oliver Pereira/stuff', + 'Wikipedia:French Wikipedia language links', + 'Wikipedia:Polish language links', + 'Wikipedia:Undisambiguated abbreviations/.+', + 'List of acronyms and initialisms', + 'Wikipedia:Usemod article histories', + 'User:Pizza Puzzle/stuff', + 'List of generic names of political parties', + 'Talk:List of initialisms/marked', + 'Talk:List of initialisms/sorted', + 'Talk:Programming language', + 'Talk:SAMPA/To do', + "Wikipedia:Outline of Roget's Thesaurus", + 'User:Wik/Articles', + 'User:Egil/Sandbox', + 'Wikipedia talk:Make only links relevant to the context', + 'Wikipedia:Common words, searching for which is not possible', ], 'fa': [ - u'ویکی‌پدیا:فهرست صفحات ابهام‌زدایی', + 'ویکی‌پدیا:فهرست صفحات ابهام‌زدایی', ], 'fi': [ - u'Wikipedia:Luettelo täsmennyssivuista', - u'Wikipedia:Luettelo (täsmennyssivuista)', - u'Wikipedia:Täsmennyssivu', + 'Wikipedia:Luettelo täsmennyssivuista', + 'Wikipedia:Luettelo (täsmennyssivuista)', + 'Wikipedia:Täsmennyssivu', ], 'fr': [ - u'Wikipédia:Liens aux pages d’homonymie', - u'Wikipédia:Homonymie', - u'Wikipédia:Homonymie/Homonymes dynastiques', + 'Wikipédia:Liens aux pages d’homonymie', + 'Wikipédia:Homonymie', + 'Wikipédia:Homonymie/Homonymes dynastiques', 'Wikipédia:Prise de décision, noms des membres ' 'de dynasties/liste des dynastiens', - u'Liste de toutes les combinaisons de deux lettres', - u'Wikipédia:Log d’upload/.*', - u'Sigles de trois lettres de [A-Z]AA à [A-Z]ZZ', - u'Wikipédia:Pages sans interwiki,.' + 'Liste de toutes les combinaisons de deux lettres', + 'Wikipédia:Log d’upload/.*', + 'Sigles de trois lettres de [A-Z]AA à [A-Z]ZZ', + 'Wikipédia:Pages sans interwiki,.' ], 'fy': [ - u'Wikipedy:Fangnet', + 'Wikipedy:Fangnet', ], 'hu': [ # hu:Wikipédia:Kocsmafal (egyéb)#Hol nem kell egyértelműsíteni? # 2012-02-08 - u'Wikipédia:(?!Sportműhely/Eddigi cikkeink).*', - u'.*\$egyértelműsítő lap\$$', - u'.*[Vv]ita:.*', - u'Szerkesztő:[^/]+$', + 'Wikipédia:(?!Sportműhely/Eddigi cikkeink).*', + '.*\$egyértelműsítő lap\$$', + '.*[Vv]ita:.*', + 'Szerkesztő:[^/]+$', ], 'ia': [ - u'Categoria:Disambiguation', - u'Wikipedia:.+', - u'Usator:.+', - u'Discussion Usator:.+', + 'Categoria:Disambiguation', + 'Wikipedia:.+', + 'Usator:.+', + 'Discussion Usator:.+', ], 'it': [ - u'Aiuto:Disambigua/Disorfanamento', - u'Discussioni utente:.+', - u'Utente:Civvì/disorfanamento', + 'Aiuto:Disambigua/Disorfanamento', + 'Discussioni utente:.+', + 'Utente:Civvì/disorfanamento', ], 'kk': [ - u'Санат:Айрықты бет', + 'Санат:Айрықты бет', ], 'ko': [ - u'위키백과:(동음이의) 문서의 목록', - u'위키백과:동음이의어 문서의 목록', + '위키백과:(동음이의) 문서의 목록', + '위키백과:동음이의어 문서의 목록', ], 'lt': [ - u'Wikipedia:Rodomi nukreipiamieji straipsniai', + 'Wikipedia:Rodomi nukreipiamieji straipsniai', ], 'nl': [ - u"Gebruiker:.*", - u"Overleg gebruiker:.+[aA]rchief.*", - u"Overleg gebruiker:Pven", - u"Portaal:.+[aA]rchief.*", - u"Wikipedia:Humor en onzin.*", - u"Wikipedia:Links naar doorverwijspagina's/Winkeldochters.*", - u"Wikipedia:Project aanmelding bij startpagina's", - u"Wikipedia:Wikiproject Roemeense gemeenten/Doorverwijspagina's", - u'Categorie:Doorverwijspagina', - u'Lijst van Nederlandse namen van pausen', - u'Overleg Wikipedia:Discussie spelling 2005', - u'Overleg Wikipedia:Doorverwijspagina', - u'Overleg Wikipedia:Logboek.*', - u'Wikipedia:Logboek.*', - u'Overleg gebruiker:Sybren/test.*', - u'Overleg gebruiker:([0-9][0-9]?[0-9]?\\.){3}[0-9][0-9]?[0-9]?', - u'Overleg:Lage Landen (staatkunde)', - u'Wikipedia:.*[aA]rchief.*', - u'Wikipedia:Doorverwijspagina', - u'Wikipedia:Lijst van alle tweeletter-combinaties', - u'Wikipedia:Onderhoudspagina', - u'Wikipedia:Ongelijke redirects', - u'Wikipedia:Protection log', - u'Wikipedia:Te verwijderen.*', - u'Wikipedia:Top 1000 van meest bekeken artikelen', - u'Wikipedia:Wikipedianen met een encyclopedisch artikel', - u'Wikipedia:Woorden die niet als zoekterm gebruikt kunnen worden', - u'Overleg gebruiker:Taka(/.*)?', - u"Wikipedia:Links naar doorverwijspagina's/Artikelen", - u"Wikipedia:Wikiproject/Redirects/.*", - u"Wikipedia:Wikiproject/Muziek/Overzicht/.*", - u"Wikipedia:Wikiproject/Roemeense gemeenten/Doorverwijspagina's", - u"Overleg Wikipedia:Wikiproject/Redirects.*", - u"Wikipedia:Links naar doorverwijspagina's/Amsterdamconstructie", + 'Gebruiker:.*', + 'Overleg gebruiker:.+[aA]rchief.*', + 'Overleg gebruiker:Pven', + 'Portaal:.+[aA]rchief.*', + 'Wikipedia:Humor en onzin.*', + "Wikipedia:Links naar doorverwijspagina's/Winkeldochters.*", + "Wikipedia:Project aanmelding bij startpagina's", + "Wikipedia:Wikiproject Roemeense gemeenten/Doorverwijspagina's", + 'Categorie:Doorverwijspagina', + 'Lijst van Nederlandse namen van pausen', + 'Overleg Wikipedia:Discussie spelling 2005', + 'Overleg Wikipedia:Doorverwijspagina', + 'Overleg Wikipedia:Logboek.*', + 'Wikipedia:Logboek.*', + 'Overleg gebruiker:Sybren/test.*', + 'Overleg gebruiker:([0-9][0-9]?[0-9]?\\.){3}[0-9][0-9]?[0-9]?', + 'Overleg:Lage Landen (staatkunde)', + 'Wikipedia:.*[aA]rchief.*', + 'Wikipedia:Doorverwijspagina', + 'Wikipedia:Lijst van alle tweeletter-combinaties', + 'Wikipedia:Onderhoudspagina', + 'Wikipedia:Ongelijke redirects', + 'Wikipedia:Protection log', + 'Wikipedia:Te verwijderen.*', + 'Wikipedia:Top 1000 van meest bekeken artikelen', + 'Wikipedia:Wikipedianen met een encyclopedisch artikel', + 'Wikipedia:Woorden die niet als zoekterm gebruikt kunnen worden', + 'Overleg gebruiker:Taka(/.*)?', + "Wikipedia:Links naar doorverwijspagina's/Artikelen", + 'Wikipedia:Wikiproject/Redirects/.*', + 'Wikipedia:Wikiproject/Muziek/Overzicht/.*', + "Wikipedia:Wikiproject/Roemeense gemeenten/Doorverwijspagina's", + 'Overleg Wikipedia:Wikiproject/Redirects.*', + "Wikipedia:Links naar doorverwijspagina's/Amsterdamconstructie", ], 'pl': [ - u'Wikipedysta:.+', - u'Dyskusja.+:.+', + 'Wikipedysta:.+', + 'Dyskusja.+:.+', ], 'pt': [ - u'Usuário:.+', - u'Usuário Discussão:.+', - u'Discussão:.+', - u'Lista de combinações de duas letras', - u'Wikipedia:Lista de páginas de desambiguação.+', - u'Wikipedia:Páginas para eliminar/.+', + 'Usuário:.+', + 'Usuário Discussão:.+', + 'Discussão:.+', + 'Lista de combinações de duas letras', + 'Wikipedia:Lista de páginas de desambiguação.+', + 'Wikipedia:Páginas para eliminar/.+', ], 'ru': [ - u'Категория:Disambig', - u'Википедия:Страницы разрешения неоднозначностей', - u'Википедия:Вики-уборка/Статьи без языковых ссылок', - u'Википедия:Страницы с пометкой «(значения)»', - u'Список общерусских фамилий', + 'Категория:Disambig', + 'Википедия:Страницы разрешения неоднозначностей', + 'Википедия:Вики-уборка/Статьи без языковых ссылок', + 'Википедия:Страницы с пометкой «(значения)»', + 'Список общерусских фамилий', ], 'sr': [ 'Википедија:Вишезначна одредница', @@ -357,10 +357,10 @@ }, 'memoryalpha': { 'en': [ - u'Memory Alpha:Links to disambiguating pages' + 'Memory Alpha:Links to disambiguating pages' ], 'de': [ - u'Memory Alpha:Liste der Wortklärungsseiten' + 'Memory Alpha:Liste der Wortklärungsseiten' ], }, } @@ -380,7 +380,7 @@ """ linkupper = link.title() linklower = first_lower(linkupper) - if "[[%s]]" % linklower in text or "[[%s|" % linklower in text: + if '[[%s]]' % linklower in text or '[[%s|' % linklower in text: return linklower else: return linkupper @@ -416,7 +416,7 @@ namespaces=0 if self.main_only else None ) ] - pywikibot.output(u"Found %d references." % len(refs)) + pywikibot.output('Found {0} references.'.format(len(refs))) # Remove ignorables if self.disambPage.site.family.name in ignore_title and \ self.disambPage.site.lang in ignore_title[ @@ -425,16 +425,15 @@ ][self.disambPage.site.lang]: for i in range(len(refs) - 1, -1, -1): if re.match(ig, refs[i].title()): - pywikibot.log(u'Ignoring page %s' - % refs[i].title()) + pywikibot.log('Ignoring page ' + refs[i].title()) del refs[i] elif self.primaryIgnoreManager.isIgnored(refs[i]): del refs[i] if len(refs) < self.minimum: - pywikibot.output(u"Found only %d pages to work on; skipping." - % len(refs)) + pywikibot.output('Found only {0} pages to work on; skipping.' + .format(len(refs))) return - pywikibot.output(u"Will work on %d pages." % len(refs)) + pywikibot.output('Will work on {} pages.'.format(len(refs))) for ref in refs: yield ref @@ -605,25 +604,25 @@ """Disambiguation bot.""" ignore_contents = { - 'de': (u'{{[Ii]nuse}}', - u'{{[Ll]öschen}}', + 'de': ('{{[Ii]nuse}}', + '{{[Ll]öschen}}', ), - 'fi': (u'{{[Tt]yöstetään}}', + 'fi': ('{{[Tt]yöstetään}}', ), - 'kk': (u'{{[Ii]nuse}}', - u'{{[Pp]rocessing}}', + 'kk': ('{{[Ii]nuse}}', + '{{[Pp]rocessing}}', ), - 'nl': (u'{{wiu2}}', - u'{{nuweg}}', + 'nl': ('{{wiu2}}', + '{{nuweg}}', ), - 'ru': (u'{{[Ii]nuse}}', - u'{{[Pp]rocessing}}', + 'ru': ('{{[Ii]nuse}}', + '{{[Pp]rocessing}}', ), } primary_redir_template = { # First letter uppercase - 'hu': u'Egyért-redir', + 'hu': 'Egyért-redir', } def __init__(self, always, alternatives, getAlternatives, dnSkip, @@ -784,29 +783,32 @@ text = refPage.get() ignoreReason = self.checkContents(text) if ignoreReason: - pywikibot.output('\n\nSkipping %s because it contains %s.\n\n' - % (refPage.title(), ignoreReason)) + pywikibot.output( + '\n\nSkipping {0} because it contains {1}.\n\n' + .format(refPage.title(), ignoreReason)) else: include = True except pywikibot.IsRedirectPage: - pywikibot.output(u'%s is a redirect to %s' - % (refPage.title(), disambPage.title())) + pywikibot.output('{0} is a redirect to {1}' + .format(refPage.title(), disambPage.title())) if disambPage.isRedirectPage(): target = self.alternatives[0] - if pywikibot.input_yn(u'Do you want to make redirect %s point ' - 'to %s?' % (refPage.title(), target), - default=False, automatic_quit=False): - redir_text = '#%s [[%s]]' \ - % (self.mysite.redirect(), target) + if pywikibot.input_yn( + 'Do you want to make redirect {0} point to {1}?' + .format(refPage.title(), target), + default=False, automatic_quit=False): + redir_text = '#{0} [[{1}]]' \ + .format(self.mysite.redirect(), target) try: refPage.put(redir_text, summary=self.comment, asynchronous=True) except pywikibot.PageNotSaved as error: - pywikibot.output(u'Page not saved: %s' % error.args) + pywikibot.output('Page not saved: {0}' + .format(error.args)) else: choice = pywikibot.input_choice( - u'Do you want to work on pages linking to %s?' - % refPage.title(), + 'Do you want to work on pages linking to {0}?' + .format(refPage.title()), [('yes', 'y'), ('no', 'n'), ('change redirect', 'c')], 'n', automatic_quit=False) if choice == 'y': @@ -819,13 +821,13 @@ self.treat_links(refPage2, refPage) elif choice == 'c': text = refPage.get(get_redirect=True) - include = "redirect" + include = 'redirect' except pywikibot.NoPage: pywikibot.output( - u'Page [[%s]] does not seem to exist?! Skipping.' - % refPage.title()) + 'Page [[{0}]] does not seem to exist?! Skipping.' + .format(refPage.title())) include = False - if include in (True, "redirect"): + if include in (True, 'redirect'): # save the original text so we can show the changes later original_text = text n = 0 @@ -859,7 +861,7 @@ continue except pywikibot.Error: # must be a broken link - pywikibot.log(u"Invalid link [[%s]] in page [[%s]]" + pywikibot.log('Invalid link [[%s]] in page [[%s]]' % (m.group('title'), refPage.title())) continue n += 1 @@ -968,7 +970,7 @@ if answer[0] == 'r': # we want to throw away the original link text replaceit = link_text == page_title - elif include == "redirect": + elif include == 'redirect': replaceit = True else: replaceit = False @@ -985,12 +987,12 @@ if new_page_title not in new_targets: new_targets.append(new_page_title) if replaceit and trailing_chars: - newlink = "[[%s%s]]%s" % (new_page_title, - section, - trailing_chars) + newlink = '[[{0}{1}]]{2}'.format(new_page_title, + section, + trailing_chars) elif replaceit or (new_page_title == link_text and not section): - newlink = "[[%s]]" % new_page_title + newlink = '[[{0}]]'.format(new_page_title) # check if we can create a link with trailing characters # instead of a pipelink elif ( @@ -1001,31 +1003,31 @@ '', link_text[len(new_page_title):]) == '') and (not section) ): - newlink = "[[%s]]%s" \ - % (link_text[:len(new_page_title)], - link_text[len(new_page_title):]) + newlink = '[[{0}]]{1}'.format( + link_text[:len(new_page_title)], + link_text[len(new_page_title):]) else: - newlink = "[[%s%s|%s]]" \ - % (new_page_title, section, link_text) + newlink = '[[{0}{1}|{2}]]'.format(new_page_title, + section, link_text) text = text[:m.start()] + newlink + text[m.end():] continue # Todo: This line is unreachable (T155337) pywikibot.output(text[max(0, m.start() - 30):m.end() + 30]) if text == original_text: - pywikibot.output(u'\nNo changes have been made:\n') + pywikibot.output('\nNo changes have been made:\n') else: - pywikibot.output(u'\nThe following changes have been made:\n') + pywikibot.output('\nThe following changes have been made:\n') pywikibot.showDiff(original_text, text) - pywikibot.output(u'') + pywikibot.output('') # save the page self.setSummaryMessage(disambPage, new_targets, unlink_counter, dn) try: refPage.put(text, summary=self.comment, asynchronous=True) except pywikibot.LockedPage: - pywikibot.output(u'Page not saved: page is locked') + pywikibot.output('Page not saved: page is locked') except pywikibot.PageNotSaved as error: - pywikibot.output(u'Page not saved: %s' % error.args) + pywikibot.output('Page not saved: {0}'.format(error.args)) return 'done' def findAlternatives(self, disambPage): @@ -1056,8 +1058,8 @@ links = self.firstize(disambPage2, links) links = [correctcap(l, disambPage2.get()) for l in links] except pywikibot.NoPage: - pywikibot.output(u"No page at %s, using redirect target." - % disambTitle) + pywikibot.output('No page at {0}, using redirect target.' + .format(disambTitle)) links = disambPage.linkedPages()[:1] links = [correctcap(l, disambPage.get(get_redirect=True)) for l in links] @@ -1067,17 +1069,17 @@ target = disambPage.getRedirectTarget().title() self.alternatives.append(target) except pywikibot.NoPage: - pywikibot.output(u"The specified page was not found.") - user_input = pywikibot.input(u"""\ + pywikibot.output('The specified page was not found.') + user_input = pywikibot.input("""\ Please enter the name of the page where the redirect should have pointed at, or press enter to quit:""") - if user_input == "": + if user_input == '': self.quit() else: self.alternatives.append(user_input) except pywikibot.IsNotRedirectPage: pywikibot.output( - u"The specified page is not a redirect. Skipping.") + 'The specified page is not a redirect. Skipping.') return False elif self.getAlternatives: # not disambPage.isRedirectPage() or self.primary @@ -1096,8 +1098,8 @@ for l in links] except pywikibot.NoPage: pywikibot.output( - 'Page does not exist; using first link in page %s.' - % disambPage.title()) + 'Page does not exist; using first ' + 'link in page {0}.'.format(disambPage.title())) links = disambPage.linkedPages()[:1] links = [correctcap(l, disambPage.get()) for l in links] @@ -1109,10 +1111,10 @@ links = [correctcap(l, disambPage.get()) for l in links] except pywikibot.NoPage: - pywikibot.output(u"Page does not exist, skipping.") + pywikibot.output('Page does not exist, skipping.') return False except pywikibot.IsRedirectPage: - pywikibot.output(u"Page is a redirect, skipping.") + pywikibot.output('Page is a redirect, skipping.') return False self.alternatives += links return True @@ -1121,8 +1123,8 @@ dn=False): """Setup i18n summary message.""" # make list of new targets - comma = self.mysite.mediawiki_message(u"comma-separator") - targets = comma.join(u'[[%s]]' % page_title + comma = self.mysite.mediawiki_message('comma-separator') + targets = comma.join('[[{0}]]'.format(page_title) for page_title in new_targets) if not targets: @@ -1258,8 +1260,8 @@ alternatives.append(page.title()) else: if pywikibot.input_yn( - u'Possibility %s does not actually exist. Use it ' - 'anyway?' % page.title(), + 'Possibility {0} does not actually exist. Use it ' + 'anyway?'.format(page.title()), default=False, automatic_quit=False): alternatives.append(page.title()) else: @@ -1302,5 +1304,5 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462310 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: I66cfb8b4a06e33d0a79639eaaafa9d5520b8ae85 Gerrit-Change-Number: 462310 Gerrit-PatchSet: 11 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/selflink.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462312 ) Change subject: [cleanup] cleanup scripts/selflink.py ...................................................................... [cleanup] cleanup scripts/selflink.py - use single quotes for string literals - use str.format(...) instead of modulo for type specifiers arguments Change-Id: I04d484117fc8a7a37ce93a82703ba5c3c66a1c7e --- M scripts/selflink.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/selflink.py b/scripts/selflink.py index 03c3ebb..d760fad 100755 --- a/scripts/selflink.py +++ b/scripts/selflink.py @@ -67,8 +67,8 @@ # https://de.wikipedia.org/w/index.php?diff=next&oldid=35721641 if '<imagemap>' in self.current_page.text: pywikibot.output( - u'Skipping page %s because it contains an image map.' - % self.current_page.title(as_link=True)) + 'Skipping page {0} because it contains an image map.' + .format(self.current_page.title(as_link=True))) return self.unlink(self.current_page) @@ -103,5 +103,5 @@ return True -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462312 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: I04d484117fc8a7a37ce93a82703ba5c3c66a1c7e Gerrit-Change-Number: 462312 Gerrit-PatchSet: 1 Gerrit-Owner: 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/shell.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462311 ) Change subject: [cleanup] cleanup scripts/shell.py ...................................................................... [cleanup] cleanup scripts/shell.py - use single quotes for string literals Change-Id: Ie15ac5f0feb54d5b46f1a8aec9a1e90a2ad80745 --- M scripts/shell.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/shell.py b/scripts/shell.py index be01d95..3223520 100755 --- a/scripts/shell.py +++ b/scripts/shell.py @@ -51,7 +51,7 @@ code.interact("""Welcome to the Pywikibot interactive shell!""", local=env) -if __name__ == "__main__": +if __name__ == '__main__': if sys.platform == 'win32': import os os.system('title Python {} Shell'.format(*sys.version.split(' ', 1))) -- To view, visit https://gerrit.wikimedia.org/r/462311 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: Ie15ac5f0feb54d5b46f1a8aec9a1e90a2ad80745 Gerrit-Change-Number: 462311 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/spamremove.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462308 ) Change subject: [cleanup] cleanup scripts/spamremove.py ...................................................................... [cleanup] cleanup scripts/spamremove.py - remove preleading "u" from strings - use single quotes for string literals Change-Id: I425d87718313c9509217a175ca7601150d6e9c63 --- M scripts/spamremove.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/spamremove.py b/scripts/spamremove.py index c9d48cf..2ebd7f3 100755 --- a/scripts/spamremove.py +++ b/scripts/spamremove.py @@ -86,7 +86,7 @@ return lines = text.split('\n') newpage = [] - lastok = "" + lastok = '' for line in lines: if self.spam_external_url in line: if lastok: @@ -100,20 +100,20 @@ pywikibot.output(line) lastok = line if self.getOption('always'): - answer = "y" + answer = 'y' else: answer = pywikibot.input_choice( - u'\nDelete the red lines?', + '\nDelete the red lines?', [('yes', 'y'), ('no', 'n'), ('edit', 'e')], 'n', automatic_quit=False) - if answer == "n": + if answer == 'n': return - elif answer == "e": + elif answer == 'e': editor = TextEditor() newtext = editor.edit(text, highlight=self.spam_external_url, jumpIndex=text.find(self.spam_external_url)) else: - newtext = "\n".join(newpage) + newtext = '\n'.join(newpage) if newtext != text: self.put_current(newtext, summary=self.getOption('summary')) -- To view, visit https://gerrit.wikimedia.org/r/462308 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: I425d87718313c9509217a175ca7601150d6e9c63 Gerrit-Change-Number: 462308 Gerrit-PatchSet: 1 Gerrit-Owner: 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/version.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462280 ) Change subject: [cleanup] cleanup scripts/version.py ...................................................................... [cleanup] cleanup scripts/version.py - remove preleading "u" from strings - use str.format() instead of modulo operator for changed lines Change-Id: I140f7e27517c2d28fc50d6260ba846e93482b123 --- M scripts/version.py 1 file changed, 12 insertions(+), 13 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/version.py b/scripts/version.py index 4ce9170..840756b 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -41,9 +41,9 @@ def main(*args): """Print pywikibot version and important settings.""" - pywikibot.output('Pywikibot: %s' % getversion()) - pywikibot.output('Release version: %s' % pywikibot.__version__) - pywikibot.output('requests version: %s' % requests.__version__) + pywikibot.output('Pywikibot: ' + getversion()) + pywikibot.output('Release version: ' + pywikibot.__version__) + pywikibot.output('requests version: ' + requests.__version__) has_wikimedia_cert = False if (not hasattr(requests, 'certs') or @@ -51,31 +51,30 @@ not callable(requests.certs.where)): pywikibot.output(' cacerts: not defined') elif not os.path.isfile(requests.certs.where()): - pywikibot.output(' cacerts: %s (missing)' % requests.certs.where()) + pywikibot.output(' cacerts: {} (missing)'.format( + requests.certs.where())) else: - pywikibot.output(' cacerts: %s' % requests.certs.where()) + pywikibot.output(' cacerts: ' + requests.certs.where()) with codecs.open(requests.certs.where(), 'r', 'utf-8') as cert_file: text = cert_file.read() if WMF_CACERT in text: has_wikimedia_cert = True - pywikibot.output(u' certificate test: %s' - % ('ok' if has_wikimedia_cert else 'not ok')) + pywikibot.output(' certificate test: {}' + .format(('ok' if has_wikimedia_cert else 'not ok'))) if not has_wikimedia_cert: - pywikibot.output( - ' Please reinstall requests!') + pywikibot.output(' Please reinstall requests!') - pywikibot.output('Python: %s' % sys.version) + pywikibot.output('Python: ' + sys.version) toolforge_env_hostname = get_toolforge_hostname() if toolforge_env_hostname: - pywikibot.output('Toolforge hostname: {0}'.format( - toolforge_env_hostname)) + pywikibot.output('Toolforge hostname: ' + toolforge_env_hostname) check_environ('PYWIKIBOT_DIR') check_environ('PYWIKIBOT_DIR_PWB') check_environ('PYWIKIBOT_NO_USER_CONFIG') - pywikibot.output('Config base dir: {0}'.format(pywikibot.config2.base_dir)) + pywikibot.output('Config base dir: ' + pywikibot.config2.base_dir) for family, usernames in pywikibot.config2.usernames.items(): if usernames: pywikibot.output('Usernames for family "{0}":'.format(family)) -- To view, visit https://gerrit.wikimedia.org/r/462280 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: I140f7e27517c2d28fc50d6260ba846e93482b123 Gerrit-Change-Number: 462280 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/standardize_interwiki.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462307 ) Change subject: [cleanup] cleanup scripts/standardize_interwiki.py ...................................................................... [cleanup] cleanup scripts/standardize_interwiki.py - use single quotes for string literals and double quotes with strings that consist of single quotes within them - use str.format(...) instead of modulo for type specifiers in strings - remove preleading "u" from strings Change-Id: Ie3e4ce063e1f91de5b201a6889eab1a7c3b455d7 --- M scripts/standardize_interwiki.py 1 file changed, 17 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/standardize_interwiki.py b/scripts/standardize_interwiki.py index cad11b3..fd802fe 100644 --- a/scripts/standardize_interwiki.py +++ b/scripts/standardize_interwiki.py @@ -21,24 +21,24 @@ # The summary that the Bot will use. comment = { - 'ar': u'روبوت: توحيد قياسي للإنترويكي', + 'ar': 'روبوت: توحيد قياسي للإنترويكي', 'cs': 'Robot: standardizace interwiki', - 'de': u'Bot: Interwikilinks standardisieren', - 'en': u'Robot: Interwiki standardization', - 'fa': u'ربات: تصحیح جایگذاری میان‌ویکی‌ها', - 'fr': u'Robot : Standardisation des interwikis', - 'he': u'בוט: מסדר את האינטרוויקי', + 'de': 'Bot: Interwikilinks standardisieren', + 'en': 'Robot: Interwiki standardization', + 'fa': 'ربات: تصحیح جایگذاری میان‌ویکی‌ها', + 'fr': 'Robot : Standardisation des interwikis', + 'he': 'בוט: מסדר את האינטרוויקי', 'hi': 'बॉट: अंतरविकि मानकीकरण', - 'it': u'Bot: Standardizzo interwiki', - 'ja': u'ロボットによる: 言語間リンクを標準化', + 'it': 'Bot: Standardizzo interwiki', + 'ja': 'ロボットによる: 言語間リンクを標準化', 'ksh': 'Bot: Engerwiki Lengks opprüühme', - 'ml': u'യന്ത്രം: അന്തർവിക്കി ക്രമവൽക്കരണം', + 'ml': 'യന്ത്രം: അന്തർവിക്കി ക്രമവൽക്കരണം', 'nds': 'Bot: Links twüschen Wikis standardisseern', - 'nl': u'Bot: standaardisatie interwikiverwijzingen', - 'no': u'bot: Språklenkestandardisering', + 'nl': 'Bot: standaardisatie interwikiverwijzingen', + 'no': 'bot: Språklenkestandardisering', 'ro': 'Robot: Standardizare interwiki', 'ur': 'خودکار: بین الویکی روابط کی معیار بندی', - 'zh': u'機器人: 跨語連結標準化', + 'zh': '機器人: 跨語連結標準化', } @@ -57,11 +57,11 @@ comm = pywikibot.translate(site, comment) for pl in site.allpages(start): plname = pl.title() - pywikibot.output(u'\nLoading %s...' % plname) + pywikibot.output('\nLoading {0}...'.format(plname)) try: oldtext = pl.get() except pywikibot.IsRedirectPage: - pywikibot.output(u"%s is a redirect!" % plname) + pywikibot.output('{0} is a redirect!'.format(plname)) continue old = pl.interwiki() new = {} @@ -75,13 +75,13 @@ try: pl.put(newtext, comment=comm) except pywikibot.LockedPage: - pywikibot.output(u"%s is locked" % plname) + pywikibot.output('{0} is locked'.format(plname)) continue else: - pywikibot.output(u'No changes needed.') + pywikibot.output('No changes needed.') continue else: - pywikibot.output(u'No interwiki found.') + pywikibot.output('No interwiki found.') continue -- To view, visit https://gerrit.wikimedia.org/r/462307 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: Ie3e4ce063e1f91de5b201a6889eab1a7c3b455d7 Gerrit-Change-Number: 462307 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/states_redirect.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462306 ) Change subject: [cleanup] cleanup scripts/states_redirect.py ...................................................................... [cleanup] cleanup scripts/states_redirect.py - use single quotes for string literals and double quotes with strings that consist of single quotes within them - use str.format(...) instead of modulo for type specifiers in strings - remove preleading "u" from strings Change-Id: If045d835f9f750706b85582294d2842a27ac700d --- M scripts/states_redirect.py 1 file changed, 12 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/states_redirect.py b/scripts/states_redirect.py index 1701b6d..81f78c8 100755 --- a/scripts/states_redirect.py +++ b/scripts/states_redirect.py @@ -81,23 +81,24 @@ goal = pl.getRedirectTarget().title() if pywikibot.Page(self.site, goal).exists(): pywikibot.output( - u"Not creating %s - redirect already exists." - % goal) + 'Not creating {0} - redirect already exists.' + .format(goal)) else: pywikibot.warning( - u"%s already exists but redirects elsewhere!" - % goal) + '{0} already exists but redirects elsewhere!' + .format(goal)) except pywikibot.IsNotRedirectPage: pywikibot.warning( - u"Page %s already exists and is not a redirect " - u"Please check page!" - % pl.title()) + 'Page {0} already exists and is not a redirect ' + 'Please check page!' + .format(pl.title())) except pywikibot.NoPage: if page.isRedirectPage(): p2 = page.getRedirectTarget() pywikibot.output( - u'Note: goal page is redirect.\nCreating redirect ' - u'to "%s" to avoid double redirect.' % p2.title()) + 'Note: goal page is redirect.\nCreating redirect ' + 'to "{0}" to avoid double redirect.' + .format(p2.title())) else: p2 = page if self.force or pywikibot.input_yn('Create redirect {0}?' @@ -129,11 +130,11 @@ force = True else: pywikibot.warning( - u'argument "%s" not understood; ignoring.' % arg) + 'argument "{0}" not understood; ignoring.'.format(arg)) bot = StatesRedirectBot(start, force) bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462306 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: If045d835f9f750706b85582294d2842a27ac700d Gerrit-Change-Number: 462306 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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/surnames_redirects.py
by jenkins-bot (Code Review) 23 Sep '18

23 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462304 ) Change subject: [cleanup] cleanup scripts/surnames_redirects.py ...................................................................... [cleanup] cleanup scripts/surnames_redirects.py - use single quotes for string literals and double quotes with strings that consist of single quotes within them - use str.format(...) instead of modulo for type specifiers in strings Change-Id: I171c6169a8270419b1afc12e99663c12e1a5c395 --- M scripts/surnames_redirects.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/surnames_redirects.py b/scripts/surnames_redirects.py index 5ea2abd..21ef0d1 100755 --- a/scripts/surnames_redirects.py +++ b/scripts/surnames_redirects.py @@ -83,11 +83,11 @@ new_page = pywikibot.Page(site, possible_name) if new_page.exists(): - pywikibot.output('%s already exists, skipping...' - % new_page.title(as_link=True)) + pywikibot.output('{0} already exists, skipping...' + .format(new_page.title(as_link=True))) else: - pywikibot.output('%s doesn\'t exist' - % new_page.title(as_link=True)) + pywikibot.output("{0} doesn't exist" + .format(new_page.title(as_link=True))) choice = pywikibot.input_yn( 'Do you want to create a redirect?') if choice: @@ -127,5 +127,5 @@ pywikibot.bot.suggest_help(missing_generator=True) -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462304 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: I171c6169a8270419b1afc12e99663c12e1a5c395 Gerrit-Change-Number: 462304 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)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2018