Pywikibot-commits July 2018

pywikibot-commits@lists.wikimedia.org

1 participants
92 discussions

[Gerrit] pywikibot/core[master]: textlib._create_default_regexes: Avoid using inline flags

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/445851 ) Change subject: textlib._create_default_regexes: Avoid using inline flags ...................................................................... textlib._create_default_regexes: Avoid using inline flags - Replace dots with [\s\S] instead of using (?s). - Replace ^ with (?:(?<=\n)|\A) and replace $ with (?=\n|\Z) instead of using (?m). - Replace characters with a character class containing their uppercase and lowercase forms instead of using (?i). - During the rewrite most of the E241 errors were resolved. Fix the few remaining ones and remove E241 from tox.ini ignore codes. - Sort _regex_cache entries. - Remoe score, source, ref, pre, and gallery entries. They will be created on demand during _get_regexes call. Bug: T195538 Change-Id: Ibe2c9a35da8f2fcf4fe960c6f8447e65bea3eaea --- M pywikibot/textlib.py M tox.ini 2 files changed, 54 insertions(+), 43 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index dc844c4..1e29666 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -247,53 +247,66 @@ return lambda text: any(predicate(text) for predicate in predicates) +def _ignore_case(string): + """Return a case-insensitive pattern for the string.""" + return ''.join('[' + c.upper() + c.lower() + ']' for c in string) + + +def _tag_pattern(tag_name): + """Return a tag pattern for the given tag name.""" + return r'<{0}[ >][\s\S]*?</{0}\s*>'.format(_ignore_case(tag_name)) + + +def _tag_regex(tag_name): + """Return a compiled tag regex for the given tag name.""" + return re.compile(_tag_pattern(tag_name)) + + def _create_default_regexes(): """Fill (and possibly overwrite) _regex_cache with default regexes.""" _regex_cache.update({ - 'comment': re.compile(r'(?s)'), + # categories + 'category': (r'\[\[ *(?:%s)\s*:.*?\]\]', + lambda site: '|'.join(site.namespaces[14])), + 'comment': re.compile(r''), + # files + 'file': (FILE_LINK_REGEX, lambda site: '|'.join(site.namespaces[6])), # section headers - 'header': re.compile(r'(?m)^=+.+=+ *$'), - # preformatted text - 'pre': re.compile(r'(?is)<pre[ >].*?</pre\s*>'), - 'source': re.compile(r'(?is)<source[ >].*?</source\s*>'), - 'score': re.compile(r'(?is)<score[ >].*?</score\s*>'), - # inline references - 'ref': re.compile(r'(?is)<ref[ >].*?</ref>'), - 'template': NESTED_TEMPLATE_REGEX, + 'header': re.compile(r'(?:(?<=\n)|\A)=+.+=+ *(?=\n|\Z)'), + # external links + 'hyperlink': compileLinkR(), + # also finds links to foreign sites with preleading ":" + 'interwiki': ( + r'\[\[:?(%s)\s?:[^\]]*\]\][\s]*', + lambda site: '|'.join( + _ignore_case(i) for i in site.validLanguageLinks() + + list(site.family.obsolete.keys()))), + # Module invocations (currently only Lua) + 'invoke': ( + r'\{\{\s*\#(?:%s):[\s\S]*?\}\}', + lambda site: '|'.join( + _ignore_case(mw) for mw in site.getmagicwords('invoke'))), + # this matches internal wikilinks, but also interwiki, categories, and + # images. + 'link': re.compile(r'\[\[[^\]|]*(\|[^\]]*)?\]\]'), + # pagelist tag (used in Proofread extension). + 'pagelist': re.compile(r'<%s[\s\S]*?/>' % _ignore_case('pagelist')), + # Wikibase property inclusions + 'property': ( + r'\{\{\s*\#(?:%s):\s*[Pp]\d+.*?\}\}', + lambda site: '|'.join( + _ignore_case(mw) for mw in site.getmagicwords('property'))), + # lines that start with a colon or more will be indented + 'startcolon': re.compile(r'(?:(?<=\n)|\A):(.*?)(?=\n|\Z)'), # lines that start with a space are shown in a monospace font and # have whitespace preserved. - 'startspace': re.compile(r'(?m)^ (.*?)$'), - # lines that start with a colon or more will be indented - 'startcolon': re.compile(r'(?m)^:(.*?)$'), + 'startspace': re.compile(r'(?:(?<=\n)|\A) (.*?)(?=\n|\Z)'), # tables often have whitespace that is used to improve wiki # source code readability. # TODO: handle nested tables. - 'table': re.compile(r'(?ims)' - r'^{\|.*?^\|}|<table[ >].*?</table\s*>'), - 'hyperlink': compileLinkR(), - 'gallery': re.compile(r'(?is)<gallery.*?>.*?</gallery\s*>'), - # this matches internal wikilinks, but also interwiki, categories, and - # images. - 'link': re.compile(r'\[\[[^\]\|]*(\|[^\]]*)?\]\]'), - # also finds links to foreign sites with preleading ":" - 'interwiki': (r'(?i)\[\[:?(%s)\s?:[^\]]*\]\][\s]*', - lambda site: '|'.join( - site.validLanguageLinks() - + list(site.family.obsolete.keys()))), - # Wikibase property inclusions - 'property': (r'(?i)\{\{\s*\#(?:%s):\s*p\d+.*?\}\}', - lambda site: '|'.join(site.getmagicwords('property'))), - # Module invocations (currently only Lua) - 'invoke': (r'(?is)\{\{\s*\#(?:%s):.*?\}\}', - lambda site: '|'.join(site.getmagicwords('invoke'))), - # categories - 'category': (r'\[\[ *(?:%s)\s*:.*?\]\]', - lambda site: '|'.join(site.namespaces[14])), - # files - 'file': (FILE_LINK_REGEX, - lambda site: '|'.join(site.namespaces[6])), - # pagelist tag (used in Proofread extension). - 'pagelist': re.compile(r'(?is)<pagelist.*?/>'), + 'table': re.compile( + r'(?:(?<=\n)|\A){\|[\S\s]*?\n\|}|%s' % _tag_pattern('table')), + 'template': NESTED_TEMPLATE_REGEX, }) @@ -330,13 +343,11 @@ else: # nowiki, noinclude, includeonly, timeline, math and other # extensions - _regex_cache[exc] = re.compile( - r'(?is)<{0}\s*>.*?</{0}\s*>'.format(exc)) + _regex_cache[exc] = _tag_regex(exc) result.append(_regex_cache[exc]) # handle alias if exc == 'source': - dontTouchRegexes.append(re.compile( - r'(?is)<syntaxhighlight[ >].*?</syntaxhighlight\s*>')) + dontTouchRegexes.append(_tag_regex('syntaxhighlight')) else: # assume it's a regular expression dontTouchRegexes.append(exc) diff --git a/tox.ini b/tox.ini index 3dcde5f..275faf1 100644 --- a/tox.ini +++ b/tox.ini @@ -180,7 +180,7 @@ pywikibot/logging.py : N803 pywikibot/pagegenerators.py : N803, N806 pywikibot/specialbots.py : N803, N806 - pywikibot/textlib.py : E241, N801, N803, N806 + pywikibot/textlib.py : N801, N803, N806 pywikibot/tools/ip.py : N803 pywikibot/userinterfaces/cgi_interface.py : N803 pywikibot/userinterfaces/gui.py : N812, N803, N806 -- To view, visit https://gerrit.wikimedia.org/r/445851 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: Ibe2c9a35da8f2fcf4fe960c6f8447e65bea3eaea Gerrit-Change-Number: 445851 Gerrit-PatchSet: 4 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot

5 years, 9 months

[Gerrit] pywikibot/core[master]: [IMPR] Provide additional information for deprecation warning

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/445761 ) Change subject: [IMPR] Provide additional information for deprecation warning ...................................................................... [IMPR] Provide additional information for deprecation warning - also decrease stack level to show the line causing the warning - use DiscussionPage.site when calling extract_sections in archivebot.py Bug: T199605 Change-Id: I8282d06fe2e848e844e8c018704988d7d06b62b3 --- M pywikibot/textlib.py M scripts/archivebot.py 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 9a83cd4..3c836cd 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -315,7 +315,8 @@ if not site and exc in ('interwiki', 'property', 'invoke', 'category', 'file'): issue_deprecation_warning( - 'site=None', 'a valid site', 3) + 'site=None', + "a valid site for '{}' regex".format(exc), 2) site = pywikibot.Site() if (exc, site) not in _regex_cache: diff --git a/scripts/archivebot.py b/scripts/archivebot.py index fe907da..fcc08de 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -462,7 +462,7 @@ text = re.sub(r'^===', marker + r'===', text, flags=re.M) # Find threads, avoid archiving categories or interwiki - header, threads, footer = extract_sections(text) + header, threads, footer = extract_sections(text, self.site) header = header.replace(marker, '') if header and footer: self.header = '\n\n'.join((header.rstrip(), footer, '')) -- To view, visit https://gerrit.wikimedia.org/r/445761 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: I8282d06fe2e848e844e8c018704988d7d06b62b3 Gerrit-Change-Number: 445761 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot

5 years, 9 months

[Gerrit] pywikibot/core[master]: textlib.extract_sections: Not everything after a language link is footer

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/445768 ) Change subject: textlib.extract_sections: Not everything after a language link is footer ...................................................................... textlib.extract_sections: Not everything after a language link is footer - Move some parts of extract_sections into independent functions: _extract_sections and _extract_headings. - Use namedtuples for readability. - Remove the parts that assumed everything after a language link or everything after a category is footer. (T199539) Instead the footer is calculated as the last section's ending language links, categories, or whitespace. Bug: T199539 Change-Id: I74daaa9613522c4cbbc67eb7caea7e1b910c5739 --- M pywikibot/textlib.py 1 file changed, 44 insertions(+), 58 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 6544292..54968cf 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -13,7 +13,7 @@ # from __future__ import absolute_import, unicode_literals -from collections import OrderedDict +from collections import OrderedDict, namedtuple try: from collections.abc import Sequence except ImportError: # Python 2.7 @@ -828,6 +828,38 @@ # ------------------------------- # Functions dealing with sections # ------------------------------- +_Heading = namedtuple('_Heading', ('text', 'start', 'end')) +_Section = namedtuple('_Section', ('title', 'content')) + + +def _extract_headings(text, site): + """Return _Heading objects.""" + headings = [] + heading_regex = _get_regexes(['header'], site)[0] + for match in heading_regex.finditer(text): + start, end = match.span() + if not isDisabled(text, start) and not isDisabled(text, end): + headings.append(_Heading(match.group(), start, end)) + return headings + + +def _extract_sections(text, headings): + """Return _Section objects.""" + if headings: + # Assign them their contents + contents = [] + for i, heading in enumerate(headings): + try: + next_heading = headings[i + 1] + except IndexError: + contents.append(text[heading.end:]) + else: + contents.append(text[heading.end:next_heading.start]) + return [_Section(heading.text, content) + for heading, content in zip(headings, contents)] + return [] + + def extract_sections(text, site=None): """ Return section headings and contents found in text. @@ -859,63 +891,17 @@ @rtype: tuple of (str, list of tuples, str) """ - headings = [] - contents = [] - body = [] - - # Find valid headings - heading_regex = _get_regexes(['header'], site)[0] - pos = 0 - while True: - match = heading_regex.search(text[pos:]) - if not match: - break - start = pos + match.start() - end = pos + match.end() - if not (isDisabled(text, start) - or isDisabled(text, end)): - headings += [(match.group(), start, end)] - pos = end - - if headings: - # Assign them their contents - for i, current in enumerate(headings): - try: - following = headings[i + 1] - except IndexError: - following = None - if following: - contents.append(text[current[2]:following[1]]) - else: - contents.append(text[current[2]:]) - body = [(heading[0], section) - for heading, section in zip(headings, contents)] - + headings = _extract_headings(text, site) + sections = _extract_sections(text, headings) # Find header and footer contents - header = text[:headings[0][1]] if headings else text - - last_section = body[-1][1] if body else header - skippings = ['category', 'interwiki'] - footer_regexes = _get_regexes(skippings, site) - # we want only interwikis, not interlanguage links - footer_regexes[1] = re.compile( - footer_regexes[1].pattern.replace(':?', '')) - # find where to cut - positions = [] - for reg in footer_regexes: - match = reg.search(last_section) - if match: - positions.append(match.start()) - pos = min(pos for pos in positions) if positions else len(last_section) - - # Strip footer from last section content - last_section, footer = last_section[:pos], last_section[pos:] - if body: - body[-1] = (body[-1][0], last_section) - else: - header = last_section - - return header, body, footer + header = text[:headings[0].start] if headings else text + last_section_contents = sections[-1].content if sections else header + cat_regex, interwiki_regex = _get_regexes(('category', 'interwiki'), site) + langlink_pattern = interwiki_regex.pattern.replace(':?', '') + footer = re.search( + r'(%s)*\Z' % r'|'.join((langlink_pattern, cat_regex.pattern, r'\s+')), + last_section_contents).group().strip() + return header, sections, footer # ----------------------------------------------- @@ -2006,7 +1992,7 @@ It does not care whether a section string may contain spaces or underlines. Both will match. - If a section parameter contains a internal link, it will match the + If a section parameter contains an internal link, it will match the section with or without a preceding colon which is required for a text link e.g. for categories and files. -- To view, visit https://gerrit.wikimedia.org/r/445768 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: I74daaa9613522c4cbbc67eb7caea7e1b910c5739 Gerrit-Change-Number: 445768 Gerrit-PatchSet: 5 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot

5 years, 9 months

[Gerrit] pywikibot/core[master]: textlib.does_text_contain_section: Do not expect colon to be always e...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/445763 ) Change subject: textlib.does_text_contain_section: Do not expect colon to be always escaped ...................................................................... textlib.does_text_contain_section: Do not expect colon to be always escaped Python 3.7's re.escape does not escape the :. Bug: T199604 Change-Id: I1f8f2d0e254f421e76b97647fa93aface7ff9e72 --- M pywikibot/textlib.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 9a83cd4..6544292 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -2017,7 +2017,7 @@ """ # match preceding colon for text links - section = re.sub(r'\\\[\\\[(\\:)?', r'\[\[\:?', re.escape(section)) + section = re.sub(r'\\\[\\\[(\\?:)?', r'\[\[\:?', re.escape(section)) # match underscores and white spaces section = re.sub(r'\\?[ _]', '[ _]', section) m = re.search("=+[ ']*%s[ ']*=+" % section, pagetext) -- To view, visit https://gerrit.wikimedia.org/r/445763 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: I1f8f2d0e254f421e76b97647fa93aface7ff9e72 Gerrit-Change-Number: 445763 Gerrit-PatchSet: 2 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot

5 years, 9 months

[Gerrit] pywikibot/core[master]: [cleanup] Code cleanup

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/445629 ) Change subject: [cleanup] Code cleanup ...................................................................... [cleanup] Code cleanup - keep lines beneatch 80 chars - remove preleading u from strings - use single quotes - use double quotes to prevent escape sequences - use str.format() for changed lines These parts are detached from Icd4c6a5 Change-Id: I57534cea11796f93dd9a9dfb758c47ba190ae917 --- M scripts/blockpageschecker.py M scripts/disambredir.py M scripts/editarticle.py M scripts/flickrripper.py M scripts/followlive.py M tests/disambredir_tests.py 6 files changed, 295 insertions(+), 281 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index 0c4d5b8..bf22e22 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -79,8 +79,10 @@ templateSemiProtection = { 'cs': [r'\{\{(?:[Tt]emplate:|[Šš]ablona:|)([Dd]louhodobě[ _]p|[Pp])' r'olozamčeno(|[^\}]*)\}\}\s*'], - 'fr': [r'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Ss]emi[- ]?protection(|[^\}]*)\}\}'], - 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccoparziale(?:|[ _]scad\|.*?|\|.*?)\}\}', + 'fr': [r'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Ss]emi[- ]?' + r'protection(|[^\}]*)\}\}'], + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccoparziale' + r'(?:|[ _]scad\|.*?|\|.*?)\}\}', r'\{\{(?:[Tt]emplate:|)[Aa]bp(?:|[ _]scad\|(?:.*?))\}\}'], 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)半保護' r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*'], @@ -93,9 +95,11 @@ 'fr': [r'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Pp]rotection(|[^\}]*)\}\}', r'\{\{(?:[Tt]emplate:|[Mm]odèle:|)(?:[Pp]age|[Aa]rchive|' r'[Mm]odèle) protégée?(|[^\}]*)\}\}'], - 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisoblocco(?:|[ _]scad\|(?:.*?)|minaccia|cancellata)\}\}', + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisoblocco(?:|[ _]scad\|(?:.*?)' + r'|minaccia|cancellata)\}\}', r'\{\{(?:[Tt]emplate:|)(?:[Cc][Tt]|[Cc]anc fatte|[Cc][Ee])\}\}', - r'<div class="toccolours[ _]itwiki[ _]template[ _]avviso">\s*?[Qq]uesta pagina'], + r'<div class="toccolours[ _]itwiki[ _]template[ _]avviso">\s*?' + r'[Qq]uesta pagina'], 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)保護(?:性急|)' r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*'], 'sr': [r'\{\{(?:[Tt]emplate:|[Зз]акључано)\}\}'] @@ -103,14 +107,16 @@ # Regex to get the semi-protection move template templateSemiMoveProtection = { - 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?' + r'|\|.*?)\}\}'], 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動半保護' r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*'], } # Regex to get the total-protection move template templateTotalMoveProtection = { - 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?' + r'|\|.*?)\}\}'], 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動保護' r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*'], } @@ -129,32 +135,33 @@ 'fr': ['{{Semi-protection}}', '{{Protection}}', None, None, None], 'it': ['{{Avvisobloccoparziale}}', '{{Avvisoblocco}}', None, None, '{{Protetta}}'], - 'ja': [u'{{半保護}}', u'{{保護}}', u'{{移動半保護}}', u'{{移動保護}}', None], + 'ja': ['{{半保護}}', '{{保護}}', '{{移動半保護}}', '{{移動保護}}', None], 'sr': ['{{Закључано-анон}}', '{{Закључано}}', None, None, None], } # Category where the bot will check categoryToCheck = { - 'ar': [u'تصنيف:محتويات محمية'], + 'ar': ['تصنيف:محتويات محمية'], 'cs': ['Kategorie:Wikipedie:Zamčené stránky', 'Kategorie:Wikipedie:Polozamčené stránky', 'Kategorie:Wikipedie:Dlouhodobě zamčené stránky', 'Kategorie:Wikipedie:Dlouhodobě polozamčené stránky'], - 'fr': [u'Category:Page semi-protégée', u'Category:Page protégée', - u'Catégorie:Article protégé'], - 'en': [u'Category:Wikipedia protected pages'], - 'he': [u'קטגוריה:ויקיפדיה: דפים מוגנים', - u'קטגוריה:ויקיפדיה: דפים מוגנים חלקית'], - 'it': [u'Categoria:Pagine protette - scadute', - u'Categoria:Pagine semiprotette', u'Categoria:Voci protette'], - 'ja': [u'Category:編集保護中の記事', u'Category:編集半保護中の記事', - u'Category:移動保護中の記事'], - 'pt': [u'Category:!Páginas protegidas', - u'Category:!Páginas semiprotegidas'], - 'sr': [u'Category:Странице закључане за анонимне кориснике', u'Category:Закључане странице'], + 'fr': ['Category:Page semi-protégée', 'Category:Page protégée', + 'Catégorie:Article protégé'], + 'en': ['Category:Wikipedia protected pages'], + 'he': ['קטגוריה:ויקיפדיה: דפים מוגנים', + 'קטגוריה:ויקיפדיה: דפים מוגנים חלקית'], + 'it': ['Categoria:Pagine protette - scadute', + 'Categoria:Pagine semiprotette', 'Categoria:Voci protette'], + 'ja': ['Category:編集保護中の記事', 'Category:編集半保護中の記事', + 'Category:移動保護中の記事'], + 'pt': ['Category:!Páginas protegidas', + 'Category:!Páginas semiprotegidas'], + 'sr': ['Category:Странице закључане за анонимне кориснике', + 'Category:Закључане странице'], 'ur': ['زمرہ:محفوظ شدہ صفحات'], - 'zh': [u'Category:被保护的页面', u'Category:被保護的模板', - u'Category:暂时不能移动的页面', u'Category:被半保护的页面'], + 'zh': ['Category:被保护的页面', 'Category:被保護的模板', + 'Category:暂时不能移动的页面', 'Category:被半保护的页面'], } # Check list to block the users that haven't set their preferences @@ -197,7 +204,7 @@ def showQuest(page): """Ask for an editor and invoke it.""" quest = pywikibot.input_choice( - u'Do you want to open the page?', + 'Do you want to open the page?', [('with browser', 'b'), ('with gui', 'g'), ('no', 'n')], 'n', automatic_quit=False) if quest == 'b': @@ -255,8 +262,8 @@ genFactory.handleArg(arg) if config.mylang not in project_inserted: - pywikibot.output(u"Your project is not supported by this script.\n" - u"You have to edit the script and add it!") + pywikibot.output('Your project is not supported by this script.\n' + 'You have to edit the script and add it!') return site = pywikibot.Site() @@ -277,7 +284,7 @@ generator = genFactory.getCombinedGenerator() if not generator: generator = [] - pywikibot.output(u'Loading categories...') + pywikibot.output('Loading categories...') # Define the category if no other generator has been setted for CAT in categories: cat = pywikibot.Category(site, CAT) @@ -285,7 +292,7 @@ gen = pagegenerators.CategorizedPageGenerator(cat) for pageCat in gen: generator.append(pageCat) - pywikibot.output(u'Categories loaded, start!') + pywikibot.output('Categories loaded, start!') # Main Loop if not genFactory.nopreload: generator = pagegenerators.PreloadingGenerator(generator, @@ -299,7 +306,7 @@ pywikibot.output("%s doesn't exist! Skipping..." % pagename) continue except pywikibot.IsRedirectPage: - pywikibot.output("%s is a redirect! Skipping..." % pagename) + pywikibot.output('{} is a redirect! Skipping...'.format(pagename)) if show: showQuest(page) continue @@ -307,8 +314,9 @@ # PreloadingGenerator cannot set correctly page.editRestriction # (see bug T57322) # if not page.canBeEdited(): - # pywikibot.output("%s is sysop-protected : this account can't edit " - # "it! Skipping..." % pagename) + # pywikibot.output( + # "%s is sysop-protected : this account can't edit " + # "it! Skipping..." % pagename) # continue restrictions = page.protection() try: @@ -316,8 +324,8 @@ except KeyError: editRestr = None if not page.canBeEdited(): - pywikibot.output(u"%s is protected: " - u"this account can't edit it! Skipping..." + pywikibot.output('%s is protected: ' + "this account can't edit it! Skipping..." % pagename) continue @@ -339,17 +347,17 @@ '"templateTotalProtection"'.format(site.sitename)) if TU: - replaceToPerform = u'|'.join(TTP + TSP + TU) + replaceToPerform = '|'.join(TTP + TSP + TU) else: - replaceToPerform = u'|'.join(TTP + TSP) + replaceToPerform = '|'.join(TTP + TSP) text, changes = re.subn('<noinclude>(%s)</noinclude>' % replaceToPerform, '', text) if changes == 0: text, changes = re.subn('(%s)' % replaceToPerform, '', text) - msg = u'The page is editable for all' + msg = 'The page is editable for all' if not moveBlockCheck: - msg += u', deleting the template..' - pywikibot.output(u'%s.' % msg) + msg += ', deleting the template..' + pywikibot.output(msg + '.') elif editRestr[0] == 'sysop': # total edit protection @@ -366,8 +374,8 @@ 'Missing "templateNoRegex"'.format( site.sitename)) - pywikibot.output(u'The page is protected to the sysop, but the ' - u'template seems not correct. Fixing...') + pywikibot.output('The page is protected to the sysop, but the ' + 'template seems not correct. Fixing...') if TU: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) else: @@ -387,9 +395,9 @@ 'This script is not localized to use it on \n{0}. ' 'Missing "templateNoRegex"'.format( site.sitename)) - pywikibot.output(u'The page is editable only for the ' - u'autoconfirmed users, but the template ' - u'seems not correct. Fixing...') + pywikibot.output('The page is editable only for the ' + 'autoconfirmed users, but the template ' + 'seems not correct. Fixing...') if TU: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) else: @@ -408,30 +416,31 @@ changes = -1 if not moveRestr: - pywikibot.output(u'The page is movable for all, deleting the ' - u'template...') + pywikibot.output('The page is movable for all, deleting the ' + 'template...') # Deleting the template because the page doesn't need it. if TU: - replaceToPerform = u'|'.join(TSMP + TTMP + TU) + replaceToPerform = '|'.join(TSMP + TTMP + TU) else: - replaceToPerform = u'|'.join(TSMP + TTMP) + replaceToPerform = '|'.join(TSMP + TTMP) text, changes = re.subn('<noinclude>(%s)</noinclude>' % replaceToPerform, '', text) if changes == 0: - text, changes = re.subn('(%s)' % replaceToPerform, '', text) + text, changes = re.subn('({})'.format(replaceToPerform), + '', text) elif moveRestr[0] == 'sysop': # move-total-protection if (TemplateInThePage[0] == 'sysop-move' and TTMP) or \ (TemplateInThePage[0] == 'unique' and TU): - pywikibot.output(u'The page is protected from moving to ' - u'the sysop, skipping...') + pywikibot.output('The page is protected from moving to ' + 'the sysop, skipping...') if TU: # no changes needed, better to revert the old text. text = oldtext else: - pywikibot.output(u'The page is protected from moving to ' - u'the sysop, but the template seems not ' - u'correct. Fixing...') + pywikibot.output('The page is protected from moving to ' + 'the sysop, but the template seems not ' + 'correct. Fixing...') if TU: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) @@ -444,15 +453,15 @@ # move-semi-protection if TemplateInThePage[0] == 'autoconfirmed-move' or \ TemplateInThePage[0] == 'unique': - pywikibot.output(u'The page is movable only for the ' - u'autoconfirmed users, skipping...') + pywikibot.output('The page is movable only for the ' + 'autoconfirmed users, skipping...') if TU: # no changes needed, better to revert the old text. text = oldtext else: - pywikibot.output(u'The page is movable only for the ' - u'autoconfirmed users, but the template ' - u'seems not correct. Fixing...') + pywikibot.output('The page is movable only for the ' + 'autoconfirmed users, but the template ' + 'seems not correct. Fixing...') if TU: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) @@ -461,7 +470,7 @@ text) if changes == 0: - # We tried to fix move-protection templates, but it did not work + # We tried to fix move-protection templates but it did not work pywikibot.warning('No move-protection template could be found') if oldtext != text: @@ -470,8 +479,8 @@ '\n\n>>> {lightpurple}{0}{default} <<<', page.title())) pywikibot.showDiff(oldtext, text) if not always: - choice = pywikibot.input_choice(u'Do you want to accept these ' - u'changes?', + choice = pywikibot.input_choice('Do you want to accept these ' + 'changes?', [('Yes', 'y'), ('No', 'n'), ('All', 'a')], 'n') if choice == 'a': @@ -481,30 +490,30 @@ try: page.put(text, commentUsed, force=True) except pywikibot.EditConflict: - pywikibot.output(u'Edit conflict! skip!') + pywikibot.output('Edit conflict! skip!') break except pywikibot.ServerError: # Sometimes there is this error that's quite annoying # because can block the whole process for nothing. errorCount += 1 if errorCount < 5: - pywikibot.output(u'Server Error! Wait..') + pywikibot.output('Server Error! Wait..') time.sleep(3) continue else: # Prevent Infinite Loops - raise pywikibot.ServerError(u'Fifth Server Error!') + raise pywikibot.ServerError('Fifth Server Error!') except pywikibot.SpamfilterError as e: - pywikibot.output(u'Cannot change %s because of ' - u'blacklist entry %s' + pywikibot.output('Cannot change %s because of ' + 'blacklist entry %s' % (page.title(), e.url)) break except pywikibot.LockedPage: - pywikibot.output(u'The page is still protected. ' - u'Skipping...') + pywikibot.output('The page is still protected. ' + 'Skipping...') break except pywikibot.PageNotSaved as error: - pywikibot.output(u'Error putting page: %s' + pywikibot.output('Error putting page: %s' % (error.args,)) break else: @@ -513,5 +522,5 @@ break -if __name__ == "__main__": +if __name__ == '__main__': main() diff --git a/scripts/disambredir.py b/scripts/disambredir.py index e6a5590..cbb1920 100755 --- a/scripts/disambredir.py +++ b/scripts/disambredir.py @@ -12,7 +12,7 @@ """ # # (C) André Engels, 2006-2009 -# (C) Pywikibot team, 2006-2017 +# (C) Pywikibot team, 2006-2018 # # Distributed under the terms of the MIT license. # @@ -41,15 +41,16 @@ return replace_callback def treat_page(self): - """Iterate over the linked pages and replace redirects conditionally.""" + """Iterate over linked pages and replace redirects conditionally.""" text = self.current_page.text for linked_page in self.current_page.linkedPages(): try: target = linked_page.getRedirectTarget() except (pywikibot.Error, pywikibot.SectionError): continue - # TODO: Work on all links at the same time (would mean that the user - # doesn't get them ordered like in links but how they appear in the page) + # TODO: Work on all links at the same time (would mean that the + # user doesn't get them ordered like in links but how they appear + # in the page) text = textlib.replace_links( text, self._create_callback(linked_page, target), self.current_page.site) @@ -85,5 +86,5 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() diff --git a/scripts/editarticle.py b/scripts/editarticle.py index df951ad..4918e8d 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -56,18 +56,18 @@ my_args = pywikibot.handle_args(args) parser = argparse.ArgumentParser(add_help=False) - parser.add_argument("-r", "--edit_redirect", "--edit-redirect", - action="store_true", help="Ignore/edit redirects") - parser.add_argument("-p", "--page", help="Page to edit") - parser.add_argument("-w", "--watch", action="store_true", - help="Watch article after edit") + parser.add_argument('-r', '--edit_redirect', '--edit-redirect', + action='store_true', help='Ignore/edit redirects') + parser.add_argument('-p', '--page', help='Page to edit') + parser.add_argument('-w', '--watch', action='store_true', + help='Watch article after edit') # convenience positional argument so we can act like a normal editor - parser.add_argument("wikipage", nargs="?", help="Page to edit") + parser.add_argument('wikipage', nargs='?', help='Page to edit') self.options = parser.parse_args(my_args) if self.options.page and self.options.wikipage: - pywikibot.error("Multiple pages passed. Please specify a single " - "page to edit.") + pywikibot.error('Multiple pages passed. Please specify a single ' + 'page to edit.') sys.exit(1) self.options.page = self.options.page or self.options.wikipage @@ -84,8 +84,8 @@ with open(fn, 'w') as fp: fp.write(new) pywikibot.output( - "An edit conflict has arisen. Your edit has been saved to %s. " - "Please try again." % fn) + 'An edit conflict has arisen. Your edit has been saved to {}. ' + 'Please try again.'.format(fn)) def run(self): """Run the bot.""" @@ -93,12 +93,12 @@ try: old = self.page.get(get_redirect=self.options.edit_redirect) except pywikibot.NoPage: - old = "" + old = '' text_editor = TextEditor() new = text_editor.edit(old) if new and old != new: pywikibot.showDiff(old, new) - changes = pywikibot.input("What did you change?") + changes = pywikibot.input('What did you change?') comment = i18n.twtranslate(self.site, 'editarticle-edit', {'description': changes}) try: @@ -107,7 +107,7 @@ except pywikibot.EditConflict: self.handle_edit_conflict(new) else: - pywikibot.output("Nothing changed") + pywikibot.output('Nothing changed') def main(*args): @@ -123,5 +123,5 @@ app.run() -if __name__ == "__main__": +if __name__ == '__main__': main() diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 8453231..b75ec67 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -90,7 +90,7 @@ # xml.etree.ElementTree.dump(photoSizes) return photoInfo, photoSizes except flickrapi.exceptions.FlickrError: - pywikibot.output(u'Flickr api problem, sleeping') + pywikibot.output('Flickr api problem, sleeping') pywikibot.sleep(30) @@ -169,14 +169,14 @@ 'http://wikipedia.ramselehof.de/flinfo.php?%s' % parameters).text -def getFilename(photoInfo, site=None, project=u'Flickr'): +def getFilename(photoInfo, site=None, project='Flickr'): """Build a good filename for the upload based on the username and title. Prevents naming collisions. """ if not site: - site = pywikibot.Site(u'commons', u'commons') + site = pywikibot.Site('commons', 'commons') username = photoInfo.find('photo').find('owner').attrib['username'] title = photoInfo.find('photo').find('title').text if title: @@ -196,10 +196,10 @@ description = description[:items] title = cleanUpTitle(description) else: - title = u'' + title = '' # Should probably have the id of the photo as last resort. - if pywikibot.Page(site, u'File:%s - %s - %s.jpg' + if pywikibot.Page(site, 'File:%s - %s - %s.jpg' % (title, project, username)).exists(): i = 1 while True: @@ -209,7 +209,7 @@ else: return name else: - return u'%s - %s - %s.jpg' % (title, project, username) + return '{} - {} - {}.jpg'.format(title, project, username) def cleanUpTitle(title): @@ -239,43 +239,44 @@ return title -def buildDescription(flinfoDescription=u'', flickrreview=False, reviewer=u'', - override=u'', addCategory=u'', removeCategories=False): +def buildDescription(flinfoDescription='', flickrreview=False, reviewer='', + override='', addCategory='', removeCategories=False): """Build the final description for the image. The description is based on the info from flickrinfo and improved. """ - description = u'== {{int:filedesc}} ==\n%s' % flinfoDescription + description = '== {{int:filedesc}} ==\n%s' % flinfoDescription if removeCategories: description = textlib.removeCategoryLinks(description, pywikibot.Site( 'commons', 'commons')) if override: - description = description.replace(u'{{cc-by-sa-2.0}}\n', u'') - description = description.replace(u'{{cc-by-2.0}}\n', u'') - description = description.replace(u'{{flickrreview}}\n', u'') + description = description.replace('{{cc-by-sa-2.0}}\n', '') + description = description.replace('{{cc-by-2.0}}\n', '') + description = description.replace('{{flickrreview}}\n', '') description = description.replace( '{{copyvio|Flickr, licensed as "All Rights Reserved" which is not ' 'a free license --~~~~}}\n', '') - description = description.replace(u'=={{int:license}}==', - u'=={{int:license}}==\n' + override) + description = description.replace('=={{int:license}}==', + '=={{int:license}}==\n' + override) elif flickrreview: if reviewer: description = description.replace( '{{flickrreview}}', '{{flickrreview|' + reviewer + - '|{{subst:CURRENTYEAR}}-{{subst:CURRENTMONTH}}-{{subst:CURRENTDAY2}}}}') + '|{{subst:CURRENTYEAR}}-{{subst:CURRENTMONTH}}' + '-{{subst:CURRENTDAY2}}}}') if addCategory: - description = description.replace(u'{{subst:unc}}\n', u'') - description = description + u'\n[[Category:' + addCategory + ']]\n' - description = description.replace(u'\r\n', u'\n') + description = description.replace('{{subst:unc}}\n', '') + description = description + '\n[[Category:' + addCategory + ']]\n' + description = description.replace('\r\n', '\n') return description -def processPhoto(flickr, photo_id=u'', flickrreview=False, reviewer=u'', - override=u'', addCategory=u'', removeCategories=False, +def processPhoto(flickr, photo_id='', flickrreview=False, reviewer='', + override='', addCategory='', removeCategories=False, autonomous=False): """Process a single Flickr photo.""" if photo_id: @@ -290,7 +291,8 @@ # Don't upload duplicate images, should add override option duplicates = findDuplicateImages(photo) if duplicates: - pywikibot.output(u'Found duplicate image at %s' % duplicates.pop()) + pywikibot.output('Found duplicate image at {}' + .format(duplicates.pop())) else: filename = getFilename(photoInfo) flinfoDescription = getFlinfoDescription(photo_id) @@ -316,14 +318,11 @@ newPhotoDescription = photoDescription newFilename = filename skip = False - # pywikibot.output(newPhotoDescription) - # if (pywikibot.Page(title=u'File:'+ filename, site=pywikibot.Site()).exists()): - # TODO: Check if the hash is the same and if not upload it under a different name - # pywikibot.output(u'File:' + filename + u' already exists!') - # else: + # Do the actual upload - # Would be nice to check before I upload if the file is already at Commons - # Not that important for this program, but maybe for derived programs + # Would be nice to check before I upload if the file is already at + # Commons. Not that important for this program, but maybe for + # derived programs if not skip: bot = UploadRobot(photoUrl, description=newPhotoDescription, @@ -333,12 +332,12 @@ bot.upload_image(debug=False) return 1 else: - pywikibot.output(u'Invalid license') + pywikibot.output('Invalid license') return 0 -def getPhotos(flickr, user_id=u'', group_id=u'', photoset_id=u'', - start_id='', end_id='', tags=u''): +def getPhotos(flickr, user_id='', group_id='', photoset_id='', + start_id='', end_id='', tags=''): """Loop over a set of Flickr photos.""" found_start_id = not start_id @@ -388,7 +387,7 @@ yield photo.attrib['id'] except flickrapi.exceptions.FlickrError: gotPhotos = False - pywikibot.output(u'Flickr api problem, sleeping') + pywikibot.output('Flickr api problem, sleeping') pywikibot.sleep(30) return @@ -400,12 +399,12 @@ TODO : Need more. """ - pywikibot.output( - u"Flickrripper is a tool to transfer flickr photos to Wikimedia Commons") - pywikibot.output(u"-group_id:<group_id>\n") - pywikibot.output(u"-photoset_id:<photoset_id>\n") - pywikibot.output(u"-user_id:<user_id>\n") - pywikibot.output(u"-tags:<tag>\n") + pywikibot.output('Flickrripper is a tool to transfer flickr photos to ' + 'Wikimedia Commons') + pywikibot.output('-group_id:<group_id>\n') + pywikibot.output('-photoset_id:<photoset_id>\n') + pywikibot.output('-user_id:<user_id>\n') + pywikibot.output('-tags:<tag>\n') return @@ -424,22 +423,24 @@ if not config.flickr['api_key']: pywikibot.output('Flickr api key not found! Get yourself an api key') pywikibot.output( - 'Any flickr user can get a key at https://www.flickr.com/services/api/keys/apply/') + 'Any flickr user can get a key at ' + 'https://www.flickr.com/services/api/keys/apply/') return if 'api_secret' in config.flickr and config.flickr['api_secret']: - flickr = flickrapi.FlickrAPI(config.flickr['api_key'], config.flickr['api_secret']) + flickr = flickrapi.FlickrAPI(config.flickr['api_key'], + config.flickr['api_secret']) else: pywikibot.output('Accessing public content only') flickr = flickrapi.FlickrAPI(config.flickr['api_key']) - group_id = u'' - photoset_id = u'' - user_id = u'' - start_id = u'' - end_id = u'' - tags = u'' - addCategory = u'' + group_id = '' + photoset_id = '' + user_id = '' + start_id = '' + end_id = '' + tags = '' + addCategory = '' removeCategories = False autonomous = False totalPhotos = 0 @@ -460,61 +461,62 @@ elif 'commons' in config.usernames['commons']: reviewer = config.usernames['commons']['commons'] else: - reviewer = u'' + reviewer = '' # Should be renamed to overrideLicense or something like that - override = u'' + override = '' for arg in local_args: if arg.startswith('-group_id'): if len(arg) == 9: - group_id = pywikibot.input(u'What is the group_id of the pool?') + group_id = pywikibot.input('What is the group_id of the pool?') else: group_id = arg[10:] elif arg.startswith('-photoset_id'): if len(arg) == 12: - photoset_id = pywikibot.input(u'What is the photoset_id?') + photoset_id = pywikibot.input('What is the photoset_id?') else: photoset_id = arg[13:] elif arg.startswith('-user_id'): if len(arg) == 8: user_id = pywikibot.input( - u'What is the user_id of the flickr user?') + 'What is the user_id of the flickr user?') else: user_id = arg[9:] elif arg.startswith('-start_id'): if len(arg) == 9: start_id = pywikibot.input( - u'What is the id of the photo you want to start at?') + 'What is the id of the photo you want to start at?') else: start_id = arg[10:] elif arg.startswith('-end_id'): if len(arg) == 7: end_id = pywikibot.input( - u'What is the id of the photo you want to end at?') + 'What is the id of the photo you want to end at?') else: end_id = arg[8:] elif arg.startswith('-tags'): if len(arg) == 5: tags = pywikibot.input( - u'What is the tag you want to filter out (currently only one supported)?') + 'What is the tag you want to filter out (currently only ' + 'one supported)?') else: tags = arg[6:] elif arg == '-flickrreview': flickrreview = True elif arg.startswith('-reviewer'): if len(arg) == 9: - reviewer = pywikibot.input(u'Who is the reviewer?') + reviewer = pywikibot.input('Who is the reviewer?') else: reviewer = arg[10:] elif arg.startswith('-override'): if len(arg) == 9: - override = pywikibot.input(u'What is the override text?') + override = pywikibot.input('What is the override text?') else: override = arg[10:] elif arg.startswith('-addcategory'): if len(arg) == 12: addCategory = pywikibot.input( - u'What category do you want to add?') + 'What category do you want to add?') else: addCategory = arg[13:] elif arg == '-removecategories': @@ -531,10 +533,10 @@ totalPhotos += 1 else: usage() - pywikibot.output(u'Finished running') - pywikibot.output(u'Total photos: ' + str(totalPhotos)) - pywikibot.output(u'Uploaded photos: ' + str(uploadedPhotos)) + pywikibot.output('Finished running') + pywikibot.output('Total photos: ' + str(totalPhotos)) + pywikibot.output('Uploaded photos: ' + str(uploadedPhotos)) -if __name__ == "__main__": +if __name__ == '__main__': main() diff --git a/scripts/followlive.py b/scripts/followlive.py index 677546d..354ad32 100644 --- a/scripts/followlive.py +++ b/scripts/followlive.py @@ -107,37 +107,37 @@ 'pos': 'top'}, }, 'fr': { - u'{{suppression}}': { - 'msg': u'à l\'aide du robot: cet article devrait être supprimé', + '{{suppression}}': { + 'msg': "à l'aide du robot: cet article devrait être supprimé", 'pos': 'top'}, - u'{{à vérifier}}': { - 'msg': u'à l\'aide du robot: cet article est à vérifier', + '{{à vérifier}}': { + 'msg': "à l'aide du robot: cet article est à vérifier", 'pos': 'top'}, - u'{{ébauche}}': { - 'msg': u'à l\'aide du robot: cet article est une ébauche', + '{{ébauche}}': { + 'msg': "à l'aide du robot: cet article est une ébauche", 'pos': 'top'}, }, 'he': { - u'{{מחק}}': { - 'msg': u'יש למחוק ערך זה', + '{{מחק}}': { + 'msg': 'יש למחוק ערך זה', 'pos': 'top' }, - u'{{לשכתב}}': { - 'msg': u'ערך זה דורש שכתוב', + '{{לשכתב}}': { + 'msg': 'ערך זה דורש שכתוב', 'pos': 'top' }, - u'{{קצרמר}}': { - 'msg': u'ערך זה הוא קצרמר', + '{{קצרמר}}': { + 'msg': 'ערך זה הוא קצרמר', 'pos': 'bottom' }, - u'{{הבהרת חשיבות}}': { - 'msg': u'חשיבותו של ערך זה אינה ברורה.', + '{{הבהרת חשיבות}}': { + 'msg': 'חשיבותו של ערך זה אינה ברורה.', 'pos': 'top' }, - u'{{עריכה}}': { - 'msg': u'ערך זה דורש עריכה', + '{{עריכה}}': { + 'msg': 'ערך זה דורש עריכה', 'pos': 'top'}, }, 'ia': { @@ -154,110 +154,110 @@ 'pos': 'bottom'}, }, 'nl': { - u'{{weg}}': { + '{{weg}}': { 'msg': '{weg}', 'pos': 'top' }, - u'{{nuweg}}': { + '{{nuweg}}': { 'msg': '{nuweg}', 'pos': 'top' }, - u'{{wiu}}': { + '{{wiu}}': { 'msg': '{wiu}', 'pos': 'top' }, - u'{{beg}}': { + '{{beg}}': { 'msg': '{beg}', 'pos': 'bottom' }, - u'{{wikify}}': { + '{{wikify}}': { 'msg': '{wikify}', 'pos': 'top' }, - u'{{wb}}': { + '{{wb}}': { 'msg': '{wb}', 'pos': 'top' }, }, 'pl': { - u'{{ek}}': { - 'msg': u'[[Kategoria:Ekspresowe kasowanko|ek]]', + '{{ek}}': { + 'msg': '[[Kategoria:Ekspresowe kasowanko|ek]]', 'pos': 'top' }, - u'{{dopracować}}': { - 'msg': u'Dopracować', + '{{dopracować}}': { + 'msg': 'Dopracować', 'pos': 'top' }, - u'{{linki}}': { - 'msg': u'Linki wewnętrzne do dodania', + '{{linki}}': { + 'msg': 'Linki wewnętrzne do dodania', 'pos': 'top' }, - u'{{źródła}}': { - 'msg': u'W artykule brakuje źródeł', + '{{źródła}}': { + 'msg': 'W artykule brakuje źródeł', 'pos': 'top' }, - u'{{stub}}': { - 'msg': u'stub (zalążek)', + '{{stub}}': { + 'msg': 'stub (zalążek)', 'pos': 'bottom' }, }, 'pt': { - u'{{wikificar}}': { + '{{wikificar}}': { 'msg': 'Assistida por bot: {{wikificar}}', 'pos': 'top'}, - u'{{reciclar}}': { + '{{reciclar}}': { 'msg': 'Assistida por bot: {{reciclar}}', 'pos': 'top'}, - u'{{lixo|~~~~}}': { + '{{lixo|~~~~}}': { 'msg': 'Assistida por bot: {{lixo}}', 'pos': 'top'}, - u'{{revisão}}': { + '{{revisão}}': { 'msg': 'Assistida por bot: {{revisão}}', 'pos': 'top'}, - u'{{impróprio}}': { + '{{impróprio}}': { 'msg': 'Assistida por bot: {{impróprio}}', 'pos': 'top'}, - u'{{apagar vaidade}}': { + '{{apagar vaidade}}': { 'msg': 'Assistida por bot: {{apagar vaidade}}', 'pos': 'top'}, }, 'sv': { - u'{{radera}}': { - 'msg': u'Robotkoll: Artikeln bör raderas', + '{{radera}}': { + 'msg': 'Robotkoll: Artikeln bör raderas', 'pos': 'top'}, - u'{{städa}}': { - 'msg': u'Robotkoll: Artikeln bör städas', + '{{städa}}': { + 'msg': 'Robotkoll: Artikeln bör städas', 'pos': 'top'}, - u'{{stub}}': { - 'msg': u'Robotkoll: Artikeln är en stubbe', + '{{stub}}': { + 'msg': 'Robotkoll: Artikeln är en stubbe', 'pos': 'bottom'}, - u'{{subst:relevanskontroll}}': { + '{{subst:relevanskontroll}}': { 'msg': 'Robotkoll: Artikeln bör kollas mot ' '[[WP:REL|Wikipedias relevanskriterier]].', 'pos': 'top'}, - u'{{verifieras}}': { - 'msg': u'Robotkoll: Artikeln bör verifieras', + '{{verifieras}}': { + 'msg': 'Robotkoll: Artikeln bör verifieras', 'pos': 'top'}, - u'{{språkvård}}': { - 'msg': u'Robotkoll: Artikeln bör språkvårdas', + '{{språkvård}}': { + 'msg': 'Robotkoll: Artikeln bör språkvårdas', 'pos': 'top'}, - u'{{Källor}}': { - 'msg': u'Robotkoll: Artikeln behöver källor', + '{{Källor}}': { + 'msg': 'Robotkoll: Artikeln behöver källor', 'pos': 'bottom'}, - u'{{wikify}}': { - 'msg': u'Robotkoll: Artikeln behöver wikifieras', + '{{wikify}}': { + 'msg': 'Robotkoll: Artikeln behöver wikifieras', 'pos': 'top'}, }, 'ur': { @@ -278,57 +278,57 @@ 'pos': 'top'}, }, 'zh': { - u'{{Delete}}': { - 'msg': u'機器人掛上模板: 本文應被刪除。', + '{{Delete}}': { + 'msg': '機器人掛上模板: 本文應被刪除。', 'pos': 'top'}, - u'{{subst:Cleanup/auto}}': { - 'msg': u'機器人掛上模板: 本文需清理', + '{{subst:Cleanup/auto}}': { + 'msg': '機器人掛上模板: 本文需清理', 'pos': 'top'}, - u'{{subst:Uncategorized/auto}}': { - 'msg': u'機器人掛上模板: 本頁需要適當的頁面分類', - 'pos': u'bottom'}, - - u'{{subst:Notability/auto}}': { - 'msg': u'機器人掛上模板: 本條目主題未突顯其知名度或顯著性', - 'pos': 'top'}, - - u'{{subst:refimprove/auto}}': { - 'msg': u'機器人掛上模板: 本條目参考文献不足', - 'pos': 'top'}, - - u'{{copyedit}}': { - 'msg': u'機器人掛上模板: 本條目或段落需要校對', - 'pos': 'top'}, - - u'{{subst:Unreferenced/auto}}': { - 'msg': u'機器人掛上模板: 本條目沒有列出任何參考或來源', - 'pos': 'top'}, - - u'{{subst:wikify/auto}}': { - 'msg': u'機器人掛上模板: 本條目需要維基化', - 'pos': 'top'}, - - u'{{subst:Notchinese/auto}}': { - 'msg': u'機器人掛上模板: 本条目没有翻译', - 'pos': 'top'}, - - u'{{subst:Substub/auto}}': { - 'msg': u'機器人掛上模板: 小小作品', - 'pos': 'top'}, - - u'{{stub}}': { - 'msg': u'機器人掛上模板: 本文是小作品', + '{{subst:Uncategorized/auto}}': { + 'msg': '機器人掛上模板: 本頁需要適當的頁面分類', 'pos': 'bottom'}, - u'{{notchinesetitle}}': { - 'msg': u'機器人掛上模板: 本条目名称需要翻译成中文', + + '{{subst:Notability/auto}}': { + 'msg': '機器人掛上模板: 本條目主題未突顯其知名度或顯著性', 'pos': 'top'}, - u'{{subst:Translating/auto}}': { - 'msg': u'機器人掛上模板: 本条目没有翻译完成', + + '{{subst:refimprove/auto}}': { + 'msg': '機器人掛上模板: 本條目参考文献不足', 'pos': 'top'}, - u'{{fansite}}': { - 'msg': u'機器人掛上模板: 本条目內容類似愛好者網站', + + '{{copyedit}}': { + 'msg': '機器人掛上模板: 本條目或段落需要校對', + 'pos': 'top'}, + + '{{subst:Unreferenced/auto}}': { + 'msg': '機器人掛上模板: 本條目沒有列出任何參考或來源', + 'pos': 'top'}, + + '{{subst:wikify/auto}}': { + 'msg': '機器人掛上模板: 本條目需要維基化', + 'pos': 'top'}, + + '{{subst:Notchinese/auto}}': { + 'msg': '機器人掛上模板: 本条目没有翻译', + 'pos': 'top'}, + + '{{subst:Substub/auto}}': { + 'msg': '機器人掛上模板: 小小作品', + 'pos': 'top'}, + + '{{stub}}': { + 'msg': '機器人掛上模板: 本文是小作品', + 'pos': 'bottom'}, + '{{notchinesetitle}}': { + 'msg': '機器人掛上模板: 本条目名称需要翻译成中文', + 'pos': 'top'}, + '{{subst:Translating/auto}}': { + 'msg': '機器人掛上模板: 本条目没有翻译完成', + 'pos': 'top'}, + '{{fansite}}': { + 'msg': '機器人掛上模板: 本条目內容類似愛好者網站', 'pos': 'top'}, }, @@ -336,7 +336,7 @@ # do nothing if this is in it done = { - 'ar': (u'{{شطب}}', u'{{حذف}}', u'{{خرق}}'), + 'ar': ('{{شطب}}', '{{حذف}}', '{{خرق}}'), 'en': ('{{VfD}}', '{{AfD}}', '{{AfD1}}', '{{cleanup}}', '{{nonsense}}', '{{deletedpage}}', '{{db-reason}}', '{{notability}}', '{{not verified}}', '{{unreferenced}}', '{{db-empty}}', @@ -360,21 +360,21 @@ '{{db-contact}}', '{{db-i2}}', '{{db-i1}}', '{{communityuseonly}}', '{{db-disparage}}', '{{db-web}}', '{{db-userreq}}', '{{db-nouser}}', '{{db-u3}}', '{{db-unfree}}'), - 'fr': (u'{{suppression}}', u'{{à vérifier}}', u'{{ébauche}}'), - 'ia': (u'{{Eliminar}}', u'{{Revision}}', u'{{Stub}}'), - 'he': (u'{{מחק}}', u'{{פירושונים}}', u'{{הצבעת מחיקה}}'), + 'fr': ('{{suppression}}', '{{à vérifier}}', '{{ébauche}}'), + 'ia': ('{{Eliminar}}', '{{Revision}}', '{{Stub}}'), + 'he': ('{{מחק}}', '{{פירושונים}}', '{{הצבעת מחיקה}}'), 'nl': ('{{nuweg}}', '{{weg}}', '{{wb}}', '{{wiu}}', '{{nocat}}'), - 'pl': ('{{ek}}', u'{{dopracować}}', '{{linki}}', u'{{źródła}}', - u'{{stub}}'), - 'pt': ('{{wikificar}}', '{{reciclar}}', '{{lixo}}', u'{{revisão}}', - u'{{impróprio}}', u'{{apagar vaidade}}'), - 'sv': (u'{{radera', u'{{Radera', u'{{städa}}', u'{{stub}}', - u'{{verifieras}}', u'{{språkvård}}', u'{{Källor', u'{{källor', - u'{{wikify}}', u'{{Ickewiki}}', u'{{ickewiki}}', u'{{Wikify}}'), - 'zh': (u'{{VfD}}', u'{{AfD}}', u'{{unreferenced}}', u'{{db-reason}}', + 'pl': ('{{ek}}', '{{dopracować}}', '{{linki}}', '{{źródła}}', + '{{stub}}'), + 'pt': ('{{wikificar}}', '{{reciclar}}', '{{lixo}}', '{{revisão}}', + '{{impróprio}}', '{{apagar vaidade}}'), + 'sv': ('{{radera', '{{Radera', '{{städa}}', '{{stub}}', + '{{verifieras}}', '{{språkvård}}', '{{Källor', '{{källor', + '{{wikify}}', '{{Ickewiki}}', '{{ickewiki}}', '{{Wikify}}'), + 'zh': ('{{VfD}}', '{{AfD}}', '{{unreferenced}}', '{{db-reason}}', '{{cleanup}}', '{{stub}}', '{{uncategorized}}', '{{notability}}', - u'{{copyedit}}', u'{{unreferenced}}', u'{{wikify}}', - u'{{Translating}}', u'{{copyvio}}', u'{{Notchinese}}'), + '{{copyedit}}', '{{unreferenced}}', '{{wikify}}', + '{{Translating}}', '{{copyvio}}', '{{Notchinese}}'), } # TODO: merge 'done' with 'templates' above @@ -416,16 +416,16 @@ try: self.content = self.page.get() except pywikibot.IsRedirectPage: - pywikibot.output(u'Already redirected, skipping.') + pywikibot.output('Already redirected, skipping.') return except pywikibot.NoPage: - pywikibot.output(u'Already deleted') + pywikibot.output('Already deleted') return for d in pywikibot.translate(self.site.code, done): if d in self.content: pywikibot.output( - u'Found: "%s" in content, nothing necessary' % d) + 'Found: "{}" in content, nothing necessary'.format(d)) return pywikibot.output('---- Start content ----------------') pywikibot.output(self.content) @@ -439,7 +439,7 @@ if answer == 'q': raise QuitKeyboardInterrupt if answer == 'd': - pywikibot.output(u'Trying to delete page [[%s]].' + pywikibot.output('Trying to delete page [[%s]].' % self.page.title()) self.page.delete() return @@ -450,7 +450,8 @@ self.userPut(self.page, old, new, summary=msg) return if answer == 'b': - pywikibot.output(u'Blanking page [[%s]].' % self.page.title()) + pywikibot.output('Blanking page [[{}]].' + .format(self.page.title())) try: self.page.put('', summary=i18n.twtranslate( @@ -466,14 +467,14 @@ pywikibot.output('Page correct ! Proceeding with next pages.') return # Check user input: - if answer[0] == 'u': + if answer[0] == '': # Answer entered as an utf8 string answer = answer[1:] try: choices = answer.split(',') except ValueError: # User entered wrong value - pywikibot.error(u'"%s" is not valid' % answer) + pywikibot.error('"{}" is not valid'.format(answer)) continue # test input for choice in choices: @@ -484,9 +485,9 @@ else: answered = (x >= 1 and x <= len(self.questionlist)) if not answered: - pywikibot.error(u'"%s" is not valid' % answer) + pywikibot.error('"{}" is not valid'.format(answer)) continue - summary = u'' + summary = '' for choice in choices: answer = int(choice) # grab the template parameters @@ -507,7 +508,7 @@ pywikibot.output('Probably added %s' % self.questionlist[answer]) self.page.put(self.content, summary=summary) - pywikibot.output(u'with comment %s\n' % summary) + pywikibot.output('with comment {}\n'.format(summary)) def treat_page(self): """Process one page.""" diff --git a/tests/disambredir_tests.py b/tests/disambredir_tests.py index 8e108bf..4a8af06 100644 --- a/tests/disambredir_tests.py +++ b/tests/disambredir_tests.py @@ -5,7 +5,7 @@ These tests write to the wiki. """ # -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2018 # # Distributed under the terms of the MIT license. # @@ -25,9 +25,9 @@ """ Test cases for DisambigurationRedirectBot. - It patches the bot instances in such a way that there is no user interaction - required and it can be run autonomously. It also does not actually write to - the wiki. + It patches the bot instances in such a way that there is no user + interaction required and it can be run autonomously. It also does not + actually write to the wiki. """ family = 'wikipedia' @@ -133,12 +133,13 @@ """Test replacing target including section.""" self._patch_create_callback('s') self.bot.run() - self.assertEqual(self.page.text, - '[[Main Page|Bar]]\n' - '[[Main Page|Baz]]\n' - '[[Main Page#What we do on this wiki|User:BobBot/Redir2]]\n' - '[[Main Page#What we do on this wiki|user:BobBot/Redir2]]\n' - '[[Main Page|Label]]\n') + self.assertEqual( + self.page.text, + '[[Main Page|Bar]]\n' + '[[Main Page|Baz]]\n' + '[[Main Page#What we do on this wiki|User:BobBot/Redir2]]\n' + '[[Main Page#What we do on this wiki|user:BobBot/Redir2]]\n' + '[[Main Page|Label]]\n') def test_replace_all(self): """Test replacing target including section and label.""" -- To view, visit https://gerrit.wikimedia.org/r/445629 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: I57534cea11796f93dd9a9dfb758c47ba190ae917 Gerrit-Change-Number: 445629 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot

5 years, 9 months

[Gerrit] pywikibot/core[master]: mysql.py, diff.py, template.py: Fix N806 naming errors

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/445635 ) Change subject: mysql.py, diff.py, template.py: Fix N806 naming errors ...................................................................... mysql.py, diff.py, template.py: Fix N806 naming errors Change-Id: Ifaa54d094ec696f586230751279ea5f23d639051 --- M pywikibot/data/mysql.py M pywikibot/diff.py M scripts/template.py M tox.ini 4 files changed, 43 insertions(+), 48 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/mysql.py b/pywikibot/data/mysql.py index e07b180..77aef83 100644 --- a/pywikibot/data/mysql.py +++ b/pywikibot/data/mysql.py @@ -57,8 +57,6 @@ @type verbose: None or bool @return: generator which yield tuples """ - CHARSET = 'utf8' - # These are specified in config2.py or user-config.py if verbose is None: verbose = config.verbose_output @@ -72,7 +70,7 @@ conn = mysqldb.connect(config.db_hostname, db=config.db_name_format.format(dbname), port=config.db_port, - charset=CHARSET, + charset='utf8', **credentials) cursor = conn.cursor() diff --git a/pywikibot/diff.py b/pywikibot/diff.py index d8bf5f4..e41db4c 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -571,24 +571,24 @@ by_letter: if text_a and text_b are single lines, comparison can be done """ - FORMAT = '{2}{lightpurple}{0:{1}^50}{default}{2}' + template = '{2}{lightpurple}{0:{1}^50}{default}{2}' patch = PatchManager(oldtext, newtext, context=n, by_letter=by_letter) - pywikibot.output(color_format(FORMAT, ' ALL CHANGES ', '*', '\n')) + pywikibot.output(color_format(template, ' ALL CHANGES ', '*', '\n')) for hunk in patch.hunks: pywikibot.output(hunk.diff_text) - pywikibot.output(color_format(FORMAT, ' REVIEW CHANGES ', '*', '\n')) + pywikibot.output(color_format(template, ' REVIEW CHANGES ', '*', '\n')) text_list = patch.apply() - pywikibot.output(color_format(FORMAT, ' APPROVED CHANGES ', '*', '\n')) + pywikibot.output(color_format(template, ' APPROVED CHANGES ', '*', '\n')) if any(hunk.reviewed == hunk.APPR for hunk in patch.hunks): for hunk in patch.hunks: if hunk.reviewed == hunk.APPR: pywikibot.output(hunk.diff_text) else: - pywikibot.output(color_format(FORMAT, 'None.', '', '')) + pywikibot.output(color_format(template, 'None.', '', '')) text = ''.join(text_list) diff --git a/scripts/template.py b/scripts/template.py index 8732786..630e059 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -157,21 +157,21 @@ # regular expression to find the original template. # {{vfd}} does the same thing as {{Vfd}}, so both will be found. # The old syntax, {{msg:vfd}}, will also be found. - templatePatterns = [] + template_patterns = [] for template in self.templates: - templatePattern = template.title(with_ns=False) + template_pattern = template.title(with_ns=False) if mysite.namespaces[10].case == 'first-letter': - templatePattern = '[%s%s]%s' % (templatePattern[0].upper(), - templatePattern[0].lower(), - templatePattern[1:]) - templatePattern = re.sub(' ', '[_ ]', templatePattern) - templatePatterns.append(templatePattern) - templateRegex = re.compile( + template_pattern = '[%s%s]%s' % ( + template_pattern[0].upper(), template_pattern[0].lower(), + template_pattern[1:]) + template_pattern = re.sub(' ', '[_ ]', template_pattern) + template_patterns.append(template_pattern) + template_regex = re.compile( r'\{\{ *([mM][sS][gG]:)?(?:%s) *(?P<parameters>\|[^}]+|) *}}' - % '|'.join(templatePatterns)) + % '|'.join(template_patterns)) super(XmlDumpTemplatePageGenerator, self).__init__( - xmlfilename, site=mysite, text_predicate=templateRegex.search) + xmlfilename, site=mysite, text_predicate=template_regex.search) class TemplateRobot(ReplaceBot): @@ -220,30 +220,30 @@ exceptions = {} builder = textlib._MultiTemplateMatchBuilder(self.site) for old, new in self.templates.items(): - templateRegex = builder.pattern(old) + template_regex = builder.pattern(old) if self.getOption('subst') and self.getOption('remove'): - replacements.append((templateRegex, + replacements.append((template_regex, r'{{subst:%s\g<parameters>}}' % new)) exceptions['inside-tags'] = ['ref', 'gallery', 'poem', 'pagelist', ] elif self.getOption('subst'): - replacements.append((templateRegex, + replacements.append((template_regex, r'{{subst:%s\g<parameters>}}' % old)) exceptions['inside-tags'] = ['ref', 'gallery', 'poem', 'pagelist', ] elif self.getOption('remove'): separate_line_regex = re.compile( - r'^[*#:]* *{0} *\n'.format(templateRegex.pattern), + r'^[*#:]* *{0} *\n'.format(template_regex.pattern), re.DOTALL | re.MULTILINE) replacements.append((separate_line_regex, '')) spaced_regex = re.compile( - r' +{0} +'.format(templateRegex.pattern), + r' +{0} +'.format(template_regex.pattern), re.DOTALL) replacements.append((spaced_regex, ' ')) - replacements.append((templateRegex, '')) + replacements.append((template_regex, '')) else: template = pywikibot.Page(self.site, new, ns=10) if not template.exists(): @@ -252,7 +252,7 @@ default=False, automatic_quit=False): continue - replacements.append((templateRegex, + replacements.append((template_regex, r'{{%s\g<parameters>}}' % new)) super(TemplateRobot, self).__init__( @@ -271,7 +271,7 @@ @param args: command line arguments @type args: list of unicode """ - templateNames = [] + template_names = [] templates = {} options = {} # If xmlfilename is None, references will be loaded from the live wiki. @@ -290,7 +290,7 @@ ArgumentDeprecationWarning) site = pywikibot.Site() - genFactory = pagegenerators.GeneratorFactory() + gen_factory = pagegenerators.GeneratorFactory() for arg in local_args: if arg == '-remove': options['remove'] = True @@ -318,45 +318,45 @@ elif arg.startswith('-timestamp:'): timestamp = arg[len('-timestamp:'):] else: - if not genFactory.handleArg(arg): - templateName = pywikibot.Page(site, arg, ns=10) - templateNames.append(templateName.title(with_ns=False)) + if not gen_factory.handleArg(arg): + template_name = pywikibot.Page(site, arg, ns=10) + template_names.append(template_name.title(with_ns=False)) - if not templateNames: + if not template_names: pywikibot.bot.suggest_help(missing_parameters=['templates']) return False if options.get('subst', False) ^ options.get('remove', False): - for templateName in templateNames: - templates[templateName] = None + for template_name in template_names: + templates[template_name] = None else: try: - for i in range(0, len(templateNames), 2): - templates[templateNames[i]] = templateNames[i + 1] + for i in range(0, len(template_names), 2): + templates[template_names[i]] = template_names[i + 1] except IndexError: pywikibot.output('Unless using solely -subst or -remove, ' 'you must give an even number of template names.') return - oldTemplates = [] - for templateName in templates.keys(): - oldTemplate = pywikibot.Page(site, templateName, ns=10) - oldTemplates.append(oldTemplate) + old_templates = [] + for template_name in templates.keys(): + old_template = pywikibot.Page(site, template_name, ns=10) + old_templates.append(old_template) if xmlfilename: builder = textlib._MultiTemplateMatchBuilder(site) - predicate = builder.search_any_predicate(oldTemplates) + predicate = builder.search_any_predicate(old_templates) gen = XMLDumpPageGenerator( xmlfilename, site=site, text_predicate=predicate) else: - gen = genFactory.getCombinedGenerator() + gen = gen_factory.getCombinedGenerator() if not gen: gens = ( pagegenerators.ReferringPageGenerator(t, onlyTemplateInclusion=True) - for t in oldTemplates + for t in old_templates ) gen = chain(*gens) gen = pagegenerators.DuplicateFilterPageGenerator(gen) @@ -366,11 +366,11 @@ max_revision_depth=100, show_filtered=True) - if not genFactory.gens: + if not gen_factory.gens: # make sure that proper namespace filtering etc. is handled - gen = genFactory.getCombinedGenerator(gen) + gen = gen_factory.getCombinedGenerator(gen) - if not genFactory.nopreload: + if not gen_factory.nopreload: gen = pagegenerators.PreloadingGenerator(gen) bot = TemplateRobot(gen, templates, site=site, **options) diff --git a/tox.ini b/tox.ini index 7840119..3dcde5f 100644 --- a/tox.ini +++ b/tox.ini @@ -167,9 +167,7 @@ pywikibot/config2.py : N806 pywikibot/cosmetic_changes.py : N803, N806 pywikibot/data/api.py : N803, N806 - pywikibot/data/mysql.py : N806 pywikibot/date.py : E241, N803, N806 - pywikibot/diff.py : N806 pywikibot/editor.py : N803, N806 # __dict__ used in a discouraged manner # regex matches the first physical line of logical line of the error @@ -227,7 +225,6 @@ scripts/script_wui.py : D102, N806 scripts/solve_disambiguation.py : N803, N806 scripts/table2wiki.py : N806 - scripts/template.py : N806 scripts/unlink.py : N803 scripts/watchlist.py : N803 scripts/weblinkchecker.py : N803, N806 -- To view, visit https://gerrit.wikimedia.org/r/445635 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: Ifaa54d094ec696f586230751279ea5f23d639051 Gerrit-Change-Number: 445635 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot

5 years, 9 months

[Gerrit] pywikibot/core[master]: [IMPR] Use newly created extract_sections from textlib in archivebot

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/441627 ) Change subject: [IMPR] Use newly created extract_sections from textlib in archivebot ...................................................................... [IMPR] Use newly created extract_sections from textlib in archivebot + avoid archiving categories and interwiki Change-Id: I644f17dc6b1c775de134c5e795c456423cc40147 --- M scripts/archivebot.py 1 file changed, 21 insertions(+), 39 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index a0e229a..60b4285 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -111,8 +111,8 @@ from pywikibot.date import apply_month_delta from pywikibot import i18n -from pywikibot.textlib import TimeStripper, _get_regexes -from pywikibot.textlib import to_local_digits +from pywikibot.textlib import (extract_sections, findmarker, TimeStripper, + to_local_digits) from pywikibot.tools import issue_deprecation_warning, FrozenDict ZERO = datetime.timedelta(0) @@ -455,46 +455,28 @@ self.threads = [] self.archives = {} self.archived_threads = 0 + + # Exclude non-thread headings text = self.get() + marker = findmarker(text) + text = re.sub(r'^===', marker + r'===', text, flags=re.M) - # Replace text in following exceptions by spaces, but don't change line - # numbers and character positions - exceptions = ['comment', 'code', 'pre', 'source', 'nowiki'] - exc_regexes = _get_regexes(exceptions, self.site) - stripped_text = text - for regex in exc_regexes: - for match in re.finditer(regex, stripped_text): - before = stripped_text[:match.start()] - restricted = stripped_text[match.start():match.end()] - after = stripped_text[match.end():] - restricted = re.sub(r'[^\n]', ' ', restricted) - stripped_text = before + restricted + after - - # Find thread headers in stripped text and return their line numbers - stripped_lines = stripped_text.split('\n') - thread_headers = [] - for line_number, line in enumerate(stripped_lines, start=1): - if re.search(r'^== *[^=].*? *== *$', line): - thread_headers.append(line_number) - # Fill self by original thread headers on returned line numbers - lines = text.split('\n') - found = False # Reading header - cur_thread = None - for line_number, line in enumerate(lines, start=1): - if line_number in thread_headers: - thread_header = re.search('^== *([^=].*?) *== *$', line) - found = True # Reading threads now - if cur_thread: - self.threads.append(cur_thread) - cur_thread = DiscussionThread(thread_header.group(1), self.now, - self.timestripper) - else: - if found: - cur_thread.feed_line(line) - else: - self.header += line + '\n' - if cur_thread: + # Find threads, avoid archiving categories or interwiki + header, threads, footer = extract_sections(text) + header = header.replace(marker, '') + if header and footer: + self.header = '\n\n'.join((header.rstrip(), footer, '')) + else: + self.header = header + footer + for thread_heading, thread_content in threads: + cur_thread = DiscussionThread(thread_heading.strip('= '), self.now, + self.timestripper) + lines = thread_content.replace(marker, '').splitlines() + lines = lines[1:] # remove heading line + for line in lines: + cur_thread.feed_line(line) self.threads.append(cur_thread) + # This extra info is not desirable when run under the unittest # framework, which may be run either directly or via setup.py if pywikibot.calledModuleName() not in ['archivebot_tests', 'setup']: -- To view, visit https://gerrit.wikimedia.org/r/441627 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: I644f17dc6b1c775de134c5e795c456423cc40147 Gerrit-Change-Number: 441627 Gerrit-PatchSet: 3 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> 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: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot

5 years, 9 months

[Gerrit] pywikibot/core[master]: [IMPR] Localize on-wiki log messages in category_redirect.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/437661 ) Change subject: [IMPR] Localize on-wiki log messages in category_redirect.py ...................................................................... [IMPR] Localize on-wiki log messages in category_redirect.py Part 1/2 Part 2/2: Iecd341aa5604e18915af4883d002ee9519319594 Bug: T181861 Change-Id: I6491f0a6ccfa285f3758dff7d5a10ee31a9f649d --- M scripts/category_redirect.py 1 file changed, 81 insertions(+), 43 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index e879d07..6c256ad 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -209,8 +209,11 @@ # get the id of the newest log being archived rotate_revid = history[-1].revid # append permalink - log_text += ("\n\n'''[%s Older logs]'''" - % self.log_page.permalink(oldid=rotate_revid)) + message = i18n.twtranslate( + self.site, + 'category_redirect-older-logs', + {'oldlogs': self.log_page.permalink(oldid=rotate_revid)}) + log_text += ('\n\n' + message) return log_text def check_hard_redirect(self): @@ -233,8 +236,10 @@ target = page.getRedirectTarget() except pywikibot.CircularRedirect: target = page - self.problems.append(u"# %s is a self-linked redirect" - % page.title(as_link=True, textlink=True)) + message = i18n.twtranslate( + self.site, 'category_redirect-problem-self-linked', + {'oldcat': page.title(as_link=True, textlink=True)}) + self.problems.append(message) except RuntimeError: # race condition: someone else removed the redirect while we # were checking for it @@ -247,19 +252,28 @@ try: page.text = newtext page.save(comment) - self.log_text.append(u"* Added {{tl|%s}} to %s" - % (self.template_list[0], - page.title(as_link=True, - textlink=True))) + message = i18n.twtranslate( + self.site, 'category_redirect-log-added', { + 'ns': self.site.namespaces.TEMPLATE, + 'template': self.template_list[0], + 'oldcat': page.title(as_link=True, textlink=True) + }) + self.log_text.append(message) except pywikibot.Error: - self.log_text.append(u"* Failed to add {{tl|%s}} to %s" - % (self.template_list[0], - page.title(as_link=True, - textlink=True))) + message = i18n.twtranslate( + self.site, 'category_redirect-log-add-failed', { + 'ns': self.site.namespaces.TEMPLATE, + 'template': self.template_list[0], + 'oldcat': page.title(as_link=True, textlink=True) + }) + self.log_text.append(message) else: - self.problems.append('# {} is a hard redirect to {}'.format( - page.title(as_link=True, textlink=True), - target.title(as_link=True, textlink=True))) + message = i18n.twtranslate( + self.site, 'category_redirect-problem-hard', { + 'oldcat': page.title(as_link=True, textlink=True), + 'page': target.title(as_link=True, textlink=True) + }) + self.problems.append(message) def run(self): """Run the bot.""" @@ -320,8 +334,10 @@ catpages.add(cat) cat_title = cat.title(with_ns=False) if "category redirect" in cat_title: - self.log_text.append(u"* Ignoring %s" - % cat.title(as_link=True, textlink=True)) + message = i18n.twtranslate( + self.site, 'category_redirect-log-ignoring', + {'oldcat': cat.title(as_link=True, textlink=True)}) + self.log_text.append(message) continue if hasattr(cat, "_catinfo"): # skip empty categories that don't return a "categoryinfo" key @@ -357,25 +373,33 @@ for cat in pagegenerators.PreloadingGenerator(nonemptypages): try: if not cat.isCategoryRedirect(): - self.log_text.append(u"* False positive: %s" - % cat.title(as_link=True, - textlink=True)) + message = i18n.twtranslate( + self.site, 'category_redirect-log-false-positive', + {'oldcat': cat.title(as_link=True, textlink=True)}) + self.log_text.append(message) continue except pywikibot.Error: - self.log_text.append(u"* Could not load %s; ignoring" - % cat.title(as_link=True, textlink=True)) + message = i18n.twtranslate( + self.site, 'category_redirect-log-not-loaded', + {'oldcat': cat.title(as_link=True, textlink=True)}) + self.log_text.append(message) continue cat_title = cat.title(with_ns=False) if not self.readyToEdit(cat): counts[cat_title] = None - self.log_text.append(u"* Skipping %s; in cooldown period." - % cat.title(as_link=True, textlink=True)) + message = i18n.twtranslate( + self.site, 'category_redirect-log-skipping', + {'oldcat': cat.title(as_link=True, textlink=True)}) + self.log_text.append(message) continue dest = cat.getCategoryRedirectTarget() if not dest.exists(): - self.problems.append('# {} redirects to {}'.format( - cat.title(as_link=True, textlink=True), - dest.title(as_link=True, textlink=True))) + message = i18n.twtranslate( + self.site, 'category_redirect-problem-redirects', { + 'oldcat': cat.title(as_link=True, textlink=True), + 'redpage': dest.title(as_link=True, textlink=True) + }) + self.problems.append(message) # do a null edit on cat to update any special redirect # categories this wiki might maintain try: @@ -386,20 +410,24 @@ if dest.isCategoryRedirect(): double = dest.getCategoryRedirectTarget() if double == dest or double == cat: - self.log_text.append(u"* Redirect loop from %s" - % dest.title(as_link=True, - textlink=True)) + message = i18n.twtranslate( + self.site, 'category_redirect-log-loop', + {'oldcat': dest.title(as_link=True, textlink=True)}) + self.log_text.append(message) # do a null edit on cat try: cat.save() except Exception: pass else: - self.log_text.append( - u"* Fixed double-redirect: %s -> %s -> %s" - % (cat.title(as_link=True, textlink=True), - dest.title(as_link=True, textlink=True), - double.title(as_link=True, textlink=True))) + message = i18n.twtranslate( + self.site, 'category_redirect-log-double', { + 'oldcat': cat.title(as_link=True, textlink=True), + 'newcat': dest.title(as_link=True, textlink=True), + 'targetcat': double.title( + as_link=True, textlink=True) + }) + self.log_text.append(message) oldtext = cat.text # remove the old redirect from the old text, # leaving behind any non-redirect text @@ -413,21 +441,30 @@ cat.save(i18n.twtranslate(self.site, self.dbl_redir_comment)) except pywikibot.Error as e: - self.log_text.append("** Failed: %s" % e) + message = i18n.twtranslate( + self.site, 'category_redirect-log-failed', + {'error': e}) + self.log_text.append(message) continue found, moved = self.move_contents(cat_title, dest.title(with_ns=False), editSummary=comment) if found is None: - self.log_text.append( - u"* [[:%s%s]]: error in move_contents" - % (self.catprefix, cat_title)) + message = i18n.twtranslate( + self.site, 'category_redirect-log-move-error', { + 'oldcat': cat.title(as_link=True, textlink=True) + }) + self.log_text.append(message) elif found: record[cat_title][today] = found - self.log_text.append( - u"* [[:%s%s]]: %d found, %d moved" - % (self.catprefix, cat_title, found, moved)) + message = i18n.twtranslate( + self.site, 'category_redirect-log-moved', { + 'oldcat': cat.title(as_link=True, textlink=True), + 'found': found, + 'moved': moved + }) + self.log_text.append(message) counts[cat_title] = found # do a null edit on cat try: @@ -442,10 +479,11 @@ self.problems.sort() newredirs.sort() comment = i18n.twtranslate(self.site, self.maint_comment) + message = i18n.twtranslate(self.site, 'category_redirect-log-new') self.log_page.text = (u"\n== %i-%02i-%02iT%02i:%02i:%02iZ ==\n" % time.gmtime()[:6] + '\n'.join(self.log_text) - + '\n* New redirects since last report:\n' + + '\n* ' + message + '\n' + '\n'.join(newredirs) + '\n' + '\n'.join(self.problems) + '\n' + self.get_log_text()) -- To view, visit https://gerrit.wikimedia.org/r/437661 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: I6491f0a6ccfa285f3758dff7d5a10ee31a9f649d Gerrit-Change-Number: 437661 Gerrit-PatchSet: 9 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: MarcoAurelio <maurelio(a)tools.wmflabs.org> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot

5 years, 9 months

[Gerrit] pywikibot/i18n[master]: [IMPR] Localize on-wiki log messages in category_redirect.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/437667 ) Change subject: [IMPR] Localize on-wiki log messages in category_redirect.py ...................................................................... [IMPR] Localize on-wiki log messages in category_redirect.py Part 2/2 Part 1/2: I6491f0a6ccfa285f3758dff7d5a10ee31a9f649d Bug: T181861 Change-Id: Iecd341aa5604e18915af4883d002ee9519319594 --- M category_redirect/en.json M category_redirect/qqq.json 2 files changed, 40 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/category_redirect/en.json b/category_redirect/en.json index a285a73..4f16138 100644 --- a/category_redirect/en.json +++ b/category_redirect/en.json @@ -1,9 +1,29 @@ { - "@metadata": [], + "@metadata": { + "authors": [ + "Dvorapa" + ] + }, "category_redirect-add-template": "Bot: Adding category redirect template for maintenance", "category_redirect-change-category": "Bot: Change redirected category [[:%(oldCatLink)s|%(oldCatTitle)s]] to [[:%(newCatLink)s|%(newCatTitle)s]]", "category_redirect-comment": "Category redirect maintenance bot", "category_redirect-edit-request": "The following protected pages have been detected as requiring updates to category links: %(itemlist)s", "category_redirect-edit-request-item": "* %(title)s is in %(oldcat)s, which is a redirect to %(newcat)s", - "category_redirect-fix-double": "Bot: Fixing double-redirect" + "category_redirect-fix-double": "Bot: Fixing double-redirect", + "category_redirect-log-added": "* Added [[%(ns)s%(template)s]] to %(oldcat)s", + "category_redirect-log-add-failed": "* Failed to add [[%(ns)s%(template)s]] to %(oldcat)s", + "category_redirect-log-double": "* Fixed double-redirect: %(oldcat)s -> %(newcat)s -> %(targetcat)s", + "category_redirect-log-failed": "** Failed: %(error)s", + "category_redirect-log-false-positive": "* False positive: %(oldcat)s", + "category_redirect-log-ignoring": "* Ignoring %(oldcat)s", + "category_redirect-log-loop": "* Redirect loop from %(oldcat)s", + "category_redirect-log-moved": "* %(oldcat)s: %(found)d found, %(moved)d moved", + "category_redirect-log-move-error": "* %(oldcat)s: error in move_contents", + "category_redirect-log-new": "New redirects since last report:", + "category_redirect-log-not-loaded": "* Could not load %(oldcat)s; ignoring", + "category_redirect-log-skipping": "* Skipping %(oldcat)s; in cooldown period", + "category_redirect-older-logs": "'''[%(oldlogs)s Older logs]'''", + "category_redirect-problem-hard": "# %(oldcat)s is a hard redirect to %(page)s", + "category_redirect-problem-redirects": "# %(oldcat)s redirects to %(redpage)s", + "category_redirect-problem-self-linked": "# %(oldcat)s is a self-linked redirect" } diff --git a/category_redirect/qqq.json b/category_redirect/qqq.json index 56e2ffe..ba5c4d1 100644 --- a/category_redirect/qqq.json +++ b/category_redirect/qqq.json @@ -2,6 +2,7 @@ "@metadata": { "authors": [ "Csisc", + "Dvorapa", "John Vandenberg", "Shirayuki", "Xqt" @@ -12,5 +13,21 @@ "category_redirect-comment": "Edit summary for maintenance notice of new redirects created.", "category_redirect-edit-request": "Variables:\n* %(itemlists)s - list of edit requests (pages). Uses the message {{msg-pywikibot|Category redirect-edit-request-item}}.", "category_redirect-edit-request-item": "Used as <code>%(itemlist)s</code> in {{msg-pywikibot|Category_redirect-edit-request}}.\n\nVariables:\n* %(title)s - page title\n* %(oldcat)s - old category name\n* %(newcat)s - new category name", - "category_redirect-fix-double": "Edit summary when the bot fixes double category redirects." + "category_redirect-fix-double": "Edit summary when the bot fixes double category redirects.", + "category_redirect-log-added": "Log message indicating category redirect template was added to the category page.", + "category_redirect-log-add-failed": "Log message indicating category redirect template could not be added to the category page.", + "category_redirect-log-double": "Log message indicating category redirect chain was fixed.", + "category_redirect-log-failed": "Log message indicating category redirect chain could not be solved.", + "category_redirect-log-false-positive": "Log message indicating category page was not redirect.", + "category_redirect-log-ignoring": "Log message indicating category page is a redirect on purpose.", + "category_redirect-log-loop": "Log message indicating category redirect chain makes a loop.", + "category_redirect-log-moved": "Log message indicating pages found and moved from the redirected category.", + "category_redirect-log-move-error": "Log message indicating category contents could not be moved.", + "category_redirect-log-new": "Log page heading", + "category_redirect-log-not-loaded": "Log message indicating category page could not be loaded.", + "category_redirect-log-skipping": "Log message indicating bot is not ready to edit the page.", + "category_redirect-older-logs": "Link to older logs from the log page", + "category_redirect-problem-hard": "Log message indicating category redirect links to a non-category page.", + "category_redirect-problem-redirects": "Log message indicating category redirect redirects to a non-existing page.", + "category_redirect-problem-self-linked": "Log message indicating category redirect redirects to itself." } -- To view, visit https://gerrit.wikimedia.org/r/437667 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iecd341aa5604e18915af4883d002ee9519319594 Gerrit-Change-Number: 437667 Gerrit-PatchSet: 8 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: MarcoAurelio <maurelio(a)tools.wmflabs.org> Gerrit-Reviewer: Maven-release-user <maven-release-user(a)wikimedia.org> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot

5 years, 9 months

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

by jenkins-bot (Code Review)

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

5 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2018