Pywikibot-commits July 2020

pywikibot-commits@lists.wikimedia.org

1 participants
180 discussions

[Gerrit] ...core[master]: Update template to py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611936 ) Change subject: Update template to py3 ...................................................................... Update template to py3 Bug: T257399 Change-Id: Ibffd45d7445f3dedbc358e374d5014259f83323c --- M scripts/template.py 1 file changed, 8 insertions(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/template.py b/scripts/template.py index 766f8a8..2dab17b 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -110,22 +110,18 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - -from itertools import chain import re +from itertools import chain from warnings import warn import pywikibot from pywikibot import i18n, pagegenerators, textlib - from pywikibot.bot import SingleSiteBot from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.pagegenerators import XMLDumpPageGenerator from pywikibot.tools import deprecated, filter_unique - from scripts.replace import ReplaceRobot as ReplaceBot @@ -139,7 +135,7 @@ (cur table), and may not still transclude the template. """ - def __init__(self, templates, xmlfilename): + def __init__(self, templates, xmlfilename) -> None: """ Initializer. @@ -169,15 +165,15 @@ r'\{\{ *([mM][sS][gG]:)?(?:%s) *(?P<parameters>\|[^}]+|) *}}' % '|'.join(template_patterns)) - super(XmlDumpTemplatePageGenerator, self).__init__( - xmlfilename, site=mysite, text_predicate=template_regex.search) + super().__init__(xmlfilename, site=mysite, + text_predicate=template_regex.search) class TemplateRobot(ReplaceBot): """This bot will replace, remove or subst all occurrences of a template.""" - def __init__(self, generator, templates, **kwargs): + def __init__(self, generator, templates, **kwargs) -> None: """ Initializer. @@ -256,14 +252,14 @@ replacements.append((template_regex, r'{{%s\g<parameters>}}' % new)) - super(TemplateRobot, self).__init__( + super().__init__( generator, replacements, exceptions, always=self.getOption('always'), addcat=self.getOption('addcat'), summary=self.getOption('summary')) -def main(*args): +def main(*args) -> None: """ Process command line arguments and invoke bot. @@ -381,7 +377,4 @@ if __name__ == '__main__': - try: - main() - except Exception: - pywikibot.error('Fatal error:', exc_info=True) + main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611936 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ibffd45d7445f3dedbc358e374d5014259f83323c Gerrit-Change-Number: 611936 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update solve_disambiguation for py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611889 ) Change subject: Update solve_disambiguation for py3 ...................................................................... Update solve_disambiguation for py3 Bug: T257399 Change-Id: I859b2b79ec517e229cf5c27787420e2933588253 --- M scripts/solve_disambiguation.py 1 file changed, 51 insertions(+), 75 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index be0c757..57521b8 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -80,21 +80,22 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import codecs -from itertools import chain import os import re +from contextlib import suppress +from itertools import chain +from typing import Generator, List, Optional + import pywikibot +from pywikibot import config from pywikibot import editor as editarticle -from pywikibot.tools import first_lower, first_upper as firstcap -from pywikibot import pagegenerators, config, i18n -from pywikibot.bot import ( - SingleSiteBot, - StandardOption, HighlightContextOption, ListOption, OutputProxyOption, -) +from pywikibot import i18n, pagegenerators +from pywikibot.bot import (HighlightContextOption, ListOption, + OutputProxyOption, SingleSiteBot, StandardOption) +from pywikibot.tools import first_lower +from pywikibot.tools import first_upper as firstcap from pywikibot.tools.formatter import SequenceOutputter # Disambiguation Needed template @@ -362,7 +363,7 @@ } -def correctcap(link, text): +def correctcap(link, text) -> str: """Return the link capitalized/uncapitalized according to the text. @param link: link page @@ -371,8 +372,6 @@ @type text: str @return: uncapitalized title of the link if the text links to the link with an uncapitalized title, else capitalized - @rtype: str - """ linkupper = link.title() linklower = first_lower(linkupper) @@ -382,19 +381,18 @@ return linkupper -class ReferringPageGeneratorWithIgnore(object): +class ReferringPageGeneratorWithIgnore: """Referring Page generator, with an ignore manager.""" - def __init__(self, disambPage, primary=False, minimum=0, main_only=False): + def __init__(self, disambPage, primary=False, minimum=0, main_only=False + ) -> None: """Initializer. @type disambPage: pywikibot.Page @type primary: bool @type minimum: int @type main_only: bool - @rtype: None - """ self.disambPage = disambPage # if run with the -primary argument, enable the ignore manager @@ -403,7 +401,7 @@ self.minimum = minimum self.main_only = main_only - def __iter__(self): + def __iter__(self) -> Generator[pywikibot.Page, None, None]: """Yield pages.""" # TODO: start yielding before all referring pages have been found refs = list(self.disambPage.getReferences( @@ -427,11 +425,10 @@ .format(len(refs))) return pywikibot.output('Will work on {} pages.'.format(len(refs))) - for ref in refs: - yield ref + yield from refs -class PrimaryIgnoreManager(object): +class PrimaryIgnoreManager: """ Primary ignore manager. @@ -442,7 +439,7 @@ """ - def __init__(self, disambPage, enabled=False): + def __init__(self, disambPage, enabled=False) -> None: """Initializer. @type disambPage: pywikibot.Page @@ -458,16 +455,14 @@ if os.path.exists(folder): self._read_ignorelist(folder) - def _read_ignorelist(self, folder): + def _read_ignorelist(self, folder) -> None: """Read pages to be ignored from file. @type folder: str - @rtype: None - """ filename = os.path.join( folder, self.disambPage.title(as_filename=True) + '.txt') - try: + with suppress(IOError): # The file is stored in the disambiguation/ subdir. # Create if necessary. with codecs.open(filename, 'r', 'utf-8') as f: @@ -477,15 +472,11 @@ # skip empty lines if line: self.ignorelist.add(line) - except IOError: - pass - def isIgnored(self, refPage): + def isIgnored(self, refPage) -> bool: """Return if refPage is to be ignored. @type refPage: pywikibot.Page - @rtype: bool - """ return self.enabled and refPage.title(as_url=True) in self.ignorelist @@ -501,30 +492,28 @@ filename = config.datafilepath( 'disambiguations', self.disambPage.title(as_url=True) + '.txt') - try: + with suppress(IOError): # Open file for appending. If none exists, create a new one. with codecs.open(filename, 'a', 'utf-8') as f: f.write(refPage.title(as_url=True) + '\n') - except IOError: - pass class AddAlternativeOption(OutputProxyOption): """Add a new alternative.""" - def result(self, value): + def result(self, value) -> None: """Add the alternative and then list them.""" newAlternative = pywikibot.input('New alternative:') self._outputter.sequence.append(newAlternative) - super(AddAlternativeOption, self).result(value) + super().result(value) class EditOption(StandardOption): """Edit the text.""" - def __init__(self, option, shortcut, text, start, title): + def __init__(self, option, shortcut, text, start, title) -> None: """Initializer. @type option: str @@ -532,44 +521,38 @@ @type text: str @type start: int @type title: str - @rtype: None - """ - super(EditOption, self).__init__(option, shortcut) + super().__init__(option, shortcut) self._text = text self._start = start self._title = title @property - def stop(self): - """Return whether if user didn't press cancel and changed it. - - @rtype: bool - - """ + def stop(self) -> bool: + """Return whether if user didn't press cancel and changed it.""" return self.new_text and self.new_text != self._text - def result(self, value): + def result(self, value) -> str: """Open a text editor and let the user change it.""" editor = editarticle.TextEditor() self.new_text = editor.edit(self._text, jumpIndex=self._start, highlight=self._title) - return super(EditOption, self).result(value) + return super().result(value) class ShowPageOption(StandardOption): """Show the page's contents in an editor.""" - def __init__(self, option, shortcut, start, page): + def __init__(self, option, shortcut, start, page) -> None: """Initializer.""" - super(ShowPageOption, self).__init__(option, shortcut, stop=False) + super().__init__(option, shortcut, stop=False) self._start = start if page.isRedirectPage(): page = page.getRedirectTarget() self._page = page - def result(self, value): + def result(self, value) -> None: """Open a text editor and show the text.""" editor = editarticle.TextEditor() editor.edit(self._page.text, @@ -581,15 +564,14 @@ """An option allowing multiple aliases which also select it.""" - def __init__(self, option, shortcuts, stop=True): + def __init__(self, option, shortcuts, stop=True) -> None: """Initializer.""" - super(AliasOption, self).__init__(option, shortcuts[0], stop=stop) + super().__init__(option, shortcuts[0], stop=stop) self._aliases = frozenset(s.lower() for s in shortcuts[1:]) - def test(self, value): + def test(self, value) -> bool: """Test aliases and combine it with the original test.""" - return value.lower() in self._aliases or super(AliasOption, - self).test(value) + return value.lower() in self._aliases or super().test(value) class DisambiguationRobot(SingleSiteBot): @@ -619,9 +601,10 @@ } def __init__(self, always, alternatives, getAlternatives, dnSkip, - generator, primary, main_only, first_only=False, minimum=0): + generator, primary, main_only, first_only=False, minimum=0 + ) -> None: """Initializer.""" - super(DisambiguationRobot, self).__init__() + super().__init__() self.always = always self.alternatives = alternatives self.getAlternatives = getAlternatives @@ -640,7 +623,7 @@ self.setupRegexes() - def checkContents(self, text): + def checkContents(self, text) -> Optional[str]: """ Check if the text matches any of the ignore regexes. @@ -649,7 +632,6 @@ @return: None if none of the regular expressions given in the dictionary at the top of this class matches a substring of the text, otherwise the matched substring - @rtype: str or None """ for ig in self.ignore_contents_regexes: match = ig.search(text) @@ -657,7 +639,7 @@ return match.group() return None - def makeAlternativesUnique(self): + def makeAlternativesUnique(self) -> None: """Remove duplicate items from self.alternatives. Preserve the order of alternatives. @@ -669,7 +651,7 @@ i for i in self.alternatives if i not in seen and not seen.add(i) ] - def setupRegexes(self): + def setupRegexes(self) -> None: """Compile regular expressions.""" self.ignore_contents_regexes = [] if self.mylang in self.ignore_contents: @@ -696,7 +678,7 @@ (?P<linktrail>{})""".format(linktrail), flags=re.X) @staticmethod - def firstlinks(page): + def firstlinks(page) -> Generator[str, None, None]: """Return a list of first links of every line beginning with `*`. When a disambpage is full of unnecessary links, this may be useful @@ -712,7 +694,7 @@ if found: yield found.group(1) - def firstize(self, page, links): + def firstize(self, page, links) -> List[pywikibot.Page]: """Call firstlinks and remove extra links. This will remove a lot of silly redundant links from overdecorated @@ -726,7 +708,7 @@ links.remove(link) return links - def treat_links(self, refPage, disambPage): + def treat_links(self, refPage, disambPage) -> bool: """Resolve the links to disambPage or its redirects. @param disambPage: the disambiguation page or redirect we don't want @@ -736,8 +718,6 @@ @type refPage: pywikibot.Page @return: Return whether continue with next page (True) or next disambig (False) - @rtype: bool - """ nochange = True @@ -756,7 +736,7 @@ pywikibot.output('No changes necessary in ' + refPage.title()) return True - def treat_disamb_only(self, refPage, disambPage): + def treat_disamb_only(self, refPage, disambPage) -> str: """Resolve the links to disambPage but don't look for its redirects. @param disambPage: the disambiguation page or redirect we don't want @@ -767,8 +747,6 @@ @return: "nextpage" if the user enters "n" to skip this page, "nochange" if the page needs no change, and "done" if the page is processed successfully - @rtype: str - """ # TODO: break this function up into subroutines! @@ -1030,14 +1008,12 @@ pywikibot.output('Page not saved: {0}'.format(error.args)) return 'done' - def findAlternatives(self, disambPage): + def findAlternatives(self, disambPage) -> bool: """Extend self.alternatives using correctcap of disambPage.linkedPages. @param disambPage: the disambiguation page @type disambPage: pywikibot.Page @return: True if everything goes fine, False otherwise - @rtype: bool - """ if disambPage.isRedirectPage() and not self.primary: primary = i18n.translate(disambPage.site, @@ -1124,7 +1100,7 @@ return True def setSummaryMessage(self, disambPage, new_targets=[], unlink_counter=0, - dn=False): + dn=False) -> None: """Setup i18n summary message.""" # make list of new targets comma = self.mysite.mediawiki_message('comma-separator') @@ -1188,7 +1164,7 @@ 'to': targets, 'count': len(new_targets)}) - def treat(self, page): + def treat(self, page) -> None: """Work on a single disambiguation page.""" self.primaryIgnoreManager = PrimaryIgnoreManager( page, enabled=self.primary) @@ -1221,7 +1197,7 @@ self.alternatives = [] -def main(*args): +def main(*args) -> None: """ Process command line arguments and invoke bot. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611889 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I859b2b79ec517e229cf5c27787420e2933588253 Gerrit-Change-Number: 611889 Gerrit-PatchSet: 2 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update pagefromfile for py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611836 ) Change subject: Update pagefromfile for py3 ...................................................................... Update pagefromfile for py3 Bug: T257399 Change-Id: Ifa3ba4bcc667e03b3133517d03fa0dc98dadeb8d --- M scripts/pagefromfile.py 1 file changed, 14 insertions(+), 16 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 4a2baa1..537ae7c 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -61,23 +61,21 @@ can be added between them by specifying '\n' as a value. """ # -# (C) Pywikibot team, 2004-2019 +# (C) Pywikibot team, 2004-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import codecs import os import re +from typing import Generator, Tuple from warnings import warn import pywikibot from pywikibot import config, i18n -from pywikibot.bot import SingleSiteBot, CurrentPageBot -from pywikibot.bot import OptionHandler +from pywikibot.bot import CurrentPageBot, OptionHandler, SingleSiteBot from pywikibot.exceptions import ArgumentDeprecationWarning @@ -99,7 +97,7 @@ """ - def __init__(self, **kwargs): + def __init__(self, **kwargs) -> None: """Initializer.""" self.availableOptions.update({ 'always': True, @@ -113,18 +111,18 @@ 'showdiff': False, }) - super(PageFromFileRobot, self).__init__(**kwargs) + super().__init__(**kwargs) self.availableOptions.update( - {'always': False if self.getOption('showdiff') else True}) + {'always': not self.getOption('showdiff')}) - def init_page(self, item): + def init_page(self, item) -> pywikibot.Page: """Get the tuple and return the page object to be processed.""" title, content = item page = pywikibot.Page(self.site, title) page.text = content.strip() - return super(PageFromFileRobot, self).init_page(page) + return super().init_page(page) - def treat_page(self): + def treat_page(self) -> None: """Upload page content.""" page = self.current_page title = page.title() @@ -208,14 +206,14 @@ 'title': None, } - def __init__(self, filename, **kwargs): + def __init__(self, filename, **kwargs) -> None: """Initializer. Check if self.file name exists. If not, ask for a new filename. User can quit. """ - super(PageFromFileReader, self).__init__(**kwargs) + super().__init__(**kwargs) self.filename = filename self.pageStartMarker = self.getOption('begin') self.pageEndMarker = self.getOption('end') @@ -224,7 +222,7 @@ self.include = self.getOption('include') self.notitle = self.getOption('notitle') - def __iter__(self): + def __iter__(self) -> Generator[Tuple[str, str], None, None]: """Read file and yield a tuple of page title and content.""" pywikibot.output("\n\nReading '{0}'...".format(self.filename)) try: @@ -256,7 +254,7 @@ position += length yield title, contents - def findpage(self, text): + def findpage(self, text) -> Tuple[int, str, str]: """Find page to work on.""" if self.getOption('textonly'): pattern = '^(.*)$' @@ -286,7 +284,7 @@ return location.end(), title, contents -def main(*args): +def main(*args) -> None: """ Process command line arguments and invoke bot. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611836 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ifa3ba4bcc667e03b3133517d03fa0dc98dadeb8d Gerrit-Change-Number: 611836 Gerrit-PatchSet: 2 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update revertbot for py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611888 ) Change subject: Update revertbot for py3 ...................................................................... Update revertbot for py3 Bug: T257399 Change-Id: Ie8d0e6f72edb9d6618473eaf7d4ac1ea0f37864f --- M scripts/revertbot.py 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/revertbot.py b/scripts/revertbot.py index bf1eaa5..8d3a428 100755 --- a/scripts/revertbot.py +++ b/scripts/revertbot.py @@ -37,14 +37,14 @@ """ # -# (C) Pywikibot team, 2008-2019 +# (C) Pywikibot team, 2008-2020 # # Ported by Geoffrey "GEOFBOT" Mon - User:Sn1per # for Google Code-In 2013 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals +from typing import Union import pywikibot @@ -67,11 +67,11 @@ 'limit': 500 } - def __init__(self, site=None, **kwargs): + def __init__(self, site=None, **kwargs) -> None: """Initializer.""" self.site = site or pywikibot.Site() self.user = kwargs.pop('user', self.site.username()) - super(BaseRevertBot, self).__init__(**kwargs) + super().__init__(**kwargs) @deprecate_arg('max', 'total') def get_contributions(self, total=500, ns=None): @@ -79,7 +79,7 @@ return self.site.usercontribs(user=self.user, namespaces=ns, total=total) - def revert_contribs(self, callback=None): + def revert_contribs(self, callback=None) -> None: """Revert contributions.""" if callback is None: callback = self.callback @@ -94,11 +94,11 @@ else: self.log('Skipped {0} by callback'.format(item['title'])) - def callback(self, item): + def callback(self, item) -> bool: """Callback function.""" return 'top' in item - def revert(self, item): + def revert(self, item) -> Union[str, bool]: """Revert a single item.""" page = pywikibot.Page(self.site, item['title']) history = list(page.revisions(total=2)) @@ -144,7 +144,7 @@ return 'The edit(s) made in {0} by {1} was rollbacked'.format( page.title(), self.user) - def log(self, msg): + def log(self, msg) -> None: """Log the message msg.""" pywikibot.output(msg) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611888 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ie8d0e6f72edb9d6618473eaf7d4ac1ea0f37864f Gerrit-Change-Number: 611888 Gerrit-PatchSet: 3 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update redirect for py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611858 ) Change subject: Update redirect for py3 ...................................................................... Update redirect for py3 Bug: T257399 Change-Id: Icad6751f4c5efaf08becd016162cf35e01b448e1 --- M scripts/redirect.py 1 file changed, 44 insertions(+), 46 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index db3a69a..6248d33 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -74,21 +74,21 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import datetime +from typing import Any, Dict, Generator, List, Optional, Set, Tuple, Union + import pywikibot from pywikibot import i18n, xmlreader -from pywikibot.bot import (OptionHandler, SingleSiteBot, ExistingPageBot, - RedirectPageBot) +from pywikibot.bot import (ExistingPageBot, OptionHandler, RedirectPageBot, + SingleSiteBot) from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.textlib import extract_templates_and_params_regex_simple -from pywikibot.tools import issue_deprecation_warning, UnicodeType +from pywikibot.tools import issue_deprecation_warning -def space_to_underscore(link): +def space_to_underscore(link) -> str: """Convert spaces to underscore.""" # previous versions weren't expecting spaces but underscores return link.canonical_title().replace(' ', '_') @@ -112,7 +112,7 @@ def __init__(self, action, **kwargs): """Initializer.""" - super(RedirectGenerator, self).__init__(**kwargs) + super().__init__(**kwargs) self.site = pywikibot.Site() self.use_api = self.getOption('fullscan') self.use_move_log = self.getOption('moves') @@ -133,7 +133,8 @@ elif action == 'both': cls.__iter__ = lambda slf: slf.get_redirects_via_api(maxlen=2) - def get_redirects_from_dump(self, alsoGetPageTitles=False): + def get_redirects_from_dump(self, alsoGetPageTitles=False) -> Tuple[ + Dict[str, str], Set[str]]: """ Extract redirects from dump. @@ -148,8 +149,7 @@ dump = xmlreader.XmlDump(xmlFilename) redirR = self.site.redirectRegex() readPagesCount = 0 - if alsoGetPageTitles: - pageTitles = set() + pageTitles = set() for entry in dump.parse(): readPagesCount += 1 # always print status message after 10000 pages @@ -192,12 +192,10 @@ .format(entry.title)) redict[space_to_underscore(source)] = ( space_to_underscore(target_link)) - if alsoGetPageTitles: - return redict, pageTitles - else: - return redict + return redict, pageTitles - def get_redirect_pages_via_api(self): + def get_redirect_pages_via_api(self) -> Generator[pywikibot.Page, None, + None]: """Yield Pages that are redirects.""" for ns in self.namespaces: gen = self.site.allpages(start=self.api_start, @@ -212,7 +210,8 @@ return yield p - def _next_redirect_group(self): + def _next_redirect_group(self) -> Generator[List[pywikibot.Page], None, + None]: """Generator that yields batches of 500 redirects as a list.""" apiQ = [] for page in self.get_redirect_pages_via_api(): @@ -224,7 +223,8 @@ if apiQ: yield apiQ - def get_redirects_via_api(self, maxlen=8): + def get_redirects_via_api(self, maxlen=8) -> Generator[Tuple[ + str, Optional[int], str, Optional[str]], None, None]: r""" Return a generator that yields tuples of data about redirect Pages. @@ -287,7 +287,8 @@ result = None yield (redirect, result, target, final) - def retrieve_broken_redirects(self): + def retrieve_broken_redirects(self) -> Generator[ + Union[str, pywikibot.Page], None, None]: """Retrieve broken redirects.""" if self.use_api: count = 0 @@ -315,7 +316,8 @@ for page in self.site.preloadpages(self.site.broken_redirects()): yield page - def retrieve_double_redirects(self): + def retrieve_double_redirects(self) -> Generator[ + Union[str, pywikibot.Page], None, None]: """Retrieve double redirects.""" if self.use_move_log: for redir_page in self.get_moved_pages_redirects(): @@ -331,7 +333,7 @@ if count >= self.api_number: break elif self.xmlFilename: - redict = self.get_redirects_from_dump() + redict, _ = self.get_redirects_from_dump() total = len(redict) for num, (key, value) in enumerate(redict.items(), start=1): # check if the value - that is, the redirect target - is a @@ -347,7 +349,8 @@ for page in self.site.preloadpages(self.site.double_redirects()): yield page - def get_moved_pages_redirects(self): + def get_moved_pages_redirects(self) -> Generator[pywikibot.Page, None, + None]: """Generate redirects to recently-moved pages.""" # this will run forever, until user interrupts it if self.offset <= 0: @@ -372,9 +375,7 @@ try: if not moved_page.isRedirectPage(): continue - except pywikibot.BadTitle: - continue - except pywikibot.ServerError: + except (pywikibot.BadTitle, pywikibot.ServerError): continue # moved_page is now a redirect, so any redirects pointing # to it need to be changed @@ -382,12 +383,10 @@ for page in moved_page.getReferences(follow_redirects=True, filter_redirects=True): yield page - except pywikibot.NoPage: - # original title must have been deleted after move - continue - except pywikibot.CircularRedirect: - continue - except pywikibot.InterwikiRedirectPage: + except (pywikibot.CircularRedirect, + pywikibot.InterwikiRedirectPage, + pywikibot.NoPage, + ): continue @@ -395,14 +394,14 @@ """Redirect bot.""" - def __init__(self, action, **kwargs): + def __init__(self, action, **kwargs) -> None: """Initializer.""" self.availableOptions.update({ 'limit': float('inf'), 'delete': False, 'sdtemplate': None, }) - super(RedirectRobot, self).__init__(**kwargs) + super().__init__(**kwargs) self.repo = self.site.data_repository() self.is_repo = self.repo if self.repo == self.site else None self.sdtemplate = self.get_sd_template() @@ -418,11 +417,10 @@ raise NotImplementedError('No valid action "{}" found.' .format(action)) - def get_sd_template(self): + def get_sd_template(self) -> Optional[str]: """Look for speedy deletion template and return it. @return: A valid speedy deletion template. - @rtype: str or None """ if self.getOption('delete') and not self.site.has_right('delete'): sd = self.getOption('sdtemplate') @@ -446,17 +444,17 @@ .format('"{}" '.format(title) if title else '')) return None - def init_page(self, item): + def init_page(self, item) -> pywikibot.Page: """Ensure that we process page objects.""" - if isinstance(item, UnicodeType): + if isinstance(item, str): item = pywikibot.Page(self.site, item) elif isinstance(item, tuple): redir_name, code, target, final = item item = pywikibot.Page(self.site, redir_name) item._redirect_type = code - return super(RedirectRobot, self).init_page(item) + return super().init_page(item) - def delete_redirect(self, page, summary_key): + def delete_redirect(self, page, summary_key) -> None: """Delete the redirect page.""" assert page.site == self.site, ( 'target page is on different site {0}'.format(page.site)) @@ -477,7 +475,7 @@ ignore_save_related_errors=True, ignore_server_errors=True) - def delete_1_broken_redirect(self): + def delete_1_broken_redirect(self) -> None: """Treat one broken redirect.""" redir_page = self.current_page done = not self.getOption('delete') @@ -552,7 +550,7 @@ "Won't delete anything." if self.getOption('delete') else 'Skipping.')) - def fix_1_double_redirect(self): + def fix_1_double_redirect(self) -> None: """Treat one double redirect.""" newRedir = redir = self.current_page redirList = [] # bookkeeping to detect loops @@ -658,23 +656,23 @@ ignore_server_errors=True) break - def fix_double_or_delete_broken_redirect(self): + def fix_double_or_delete_broken_redirect(self) -> None: """Treat one broken or double redirect.""" if self.current_page._redirect_type == 0: self.delete_1_broken_redirect() elif self.current_page._redirect_type != 1: self.fix_1_double_redirect() - def treat(self, page): + def treat(self, page) -> None: """Treat a page.""" if self._treat_counter >= self.getOption('limit'): pywikibot.output('\nNumber of pages reached the limit. ' 'Script terminated.') self.stop() - super(RedirectRobot, self).treat(page) + super().treat(page) -def main(*args): +def main(*args) -> None: """ Process command line arguments and invoke bot. @@ -683,8 +681,8 @@ @param args: command line arguments @type args: str """ - options = {} - gen_options = {} + options = {} # type: Dict[str, Any] + gen_options = {} # type: Dict[str, Any] # what the bot should do (either resolve double redirs, or process broken # redirs) action = None -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611858 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Icad6751f4c5efaf08becd016162cf35e01b448e1 Gerrit-Change-Number: 611858 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update noreferences for py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611834 ) Change subject: Update noreferences for py3 ...................................................................... Update noreferences for py3 Bug: T257399 Change-Id: If3fb28bd9cd2c54d35d9ffeea5089571c243af70 --- M scripts/noreferences.py 1 file changed, 10 insertions(+), 16 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 390eb03..9e5a160 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -34,18 +34,14 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import re from functools import partial import pywikibot -from pywikibot import i18n, pagegenerators, textlib, Bot -from pywikibot.pagegenerators import ( - XMLDumpPageGenerator, -) +from pywikibot import Bot, i18n, pagegenerators, textlib +from pywikibot.pagegenerators import XMLDumpPageGenerator # This is required for the text that is shown when you run this script # with the parameter -help. @@ -484,7 +480,7 @@ _references_regex = re.compile('<references.*?/>', re.IGNORECASE) -def _match_xml_page_text(text): +def _match_xml_page_text(text) -> bool: """Match page text.""" text = textlib.removeDisabledParts(text) return _ref_regex.search(text) and not _references_regex.search(text) @@ -498,12 +494,12 @@ """References section bot.""" - def __init__(self, generator, **kwargs): + def __init__(self, generator, **kwargs) -> None: """Initializer.""" self.availableOptions.update({ 'verbose': True, }) - super(NoReferencesBot, self).__init__(**kwargs) + super().__init__(**kwargs) self.generator = pagegenerators.PreloadingGenerator(generator) self.site = pywikibot.Site() @@ -523,7 +519,7 @@ except KeyError: self.referencesText = '<references />' - def lacksReferences(self, text): + def lacksReferences(self, text) -> bool: """Check whether or not the page is lacking a references tag.""" oldTextCleaned = textlib.removeDisabledParts(text) if self.referencesR.search(oldTextCleaned) or \ @@ -549,7 +545,7 @@ pywikibot.output('Found ref without references.') return True - def addReferences(self, oldText): + def addReferences(self, oldText) -> str: """ Add a references tag into an existing section where it fits into. @@ -560,7 +556,6 @@ @param oldText: page text to be modified @type oldText: str @return: The modified pagetext - @rtype: str """ # Do we have a malformed <reference> tag which could be repaired? # Set the edit summary for this case @@ -670,7 +665,7 @@ index = len(tmpText) return self.createReferenceSection(oldText, index) - def createReferenceSection(self, oldText, index, ident='=='): + def createReferenceSection(self, oldText, index, ident='==') -> str: """Create a reference section and insert it into the given text. @param oldText: page text that is going to be be amended @@ -682,7 +677,6 @@ title @type ident: str @return: the amended page text with reference section added - @rtype: str """ if self.site.code in noTitleRequired: ref_section = '\n\n%s\n' % self.referencesText @@ -692,7 +686,7 @@ ident=ident, text=self.referencesText) return oldText[:index].rstrip() + ref_section + oldText[index:] - def run(self): + def run(self) -> None: """Run the bot.""" for page in self.generator: self.current_page = page @@ -736,7 +730,7 @@ .format(page.title(as_link=True))) -def main(*args): +def main(*args) -> None: """ Process command line arguments and invoke bot. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611834 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If3fb28bd9cd2c54d35d9ffeea5089571c243af70 Gerrit-Change-Number: 611834 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update newitem for py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611831 ) Change subject: Update newitem for py3 ...................................................................... Update newitem for py3 Bug: T257399 Change-Id: Ib8acdfb933cdbd6fe64c081419d8c8941b7bb82f --- M scripts/newitem.py 1 file changed, 12 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/newitem.py b/scripts/newitem.py index 1c7acf0..a7b9436 100755 --- a/scripts/newitem.py +++ b/scripts/newitem.py @@ -25,10 +25,9 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - from datetime import timedelta from textwrap import fill +from typing import Set import pywikibot from pywikibot import pagegenerators @@ -46,7 +45,7 @@ treat_missing_item = True - def __init__(self, generator, **kwargs): + def __init__(self, generator, **kwargs) -> None: """Only accepts options defined in availableOptions.""" self.availableOptions.update({ 'always': True, @@ -56,15 +55,15 @@ # created items) or True (touch all pages) }) - super(NewItemRobot, self).__init__(**kwargs) + super().__init__(**kwargs) self.generator = generator self.pageAge = self.getOption('pageage') self.lastEdit = self.getOption('lastedit') self._skipping_templates = {} - def setup(self): + def setup(self) -> None: """Setup ages.""" - super(NewItemRobot, self).setup() + super().setup() self.pageAgeBefore = self.repo.server_time() - timedelta( days=self.pageAge) @@ -79,7 +78,7 @@ .format(self.lastEdit, self.lastEditBefore.isoformat())) @staticmethod - def _touch_page(page): + def _touch_page(page) -> None: try: pywikibot.output('Doing a null edit on the page.') page.touch() @@ -93,11 +92,11 @@ pywikibot.error('Page {0} not saved.'.format( page.title(as_link=True))) - def _callback(self, page, exc): + def _callback(self, page, exc) -> None: if exc is None and self.getOption('touch'): self._touch_page(page) - def get_skipping_templates(self, site): + def get_skipping_templates(self, site) -> Set[pywikibot.Page]: """Get templates which leads the page to be skipped. If the script is used for multiple sites, hold the skipping templates @@ -125,13 +124,12 @@ self._skipping_templates[site] = skipping_templates return skipping_templates - def skip_templates(self, page): + def skip_templates(self, page) -> str: """Check whether the page is to be skipped due to skipping template. @param page: treated page @type page: pywikibot.Page @return: the template which leads to skip - @rtype: str """ skipping_templates = self.get_skipping_templates(page.site) for template, _ in page.templatesWithParams(): @@ -139,7 +137,7 @@ return template.title(with_ns=False) return '' - def skip_page(self, page): + def skip_page(self, page) -> bool: """Skip pages which are unwanted to treat.""" if page.editTime() > self.lastEditBefore: pywikibot.output( @@ -174,7 +172,7 @@ return super(NewItemRobot, self).skip_page(page) - def treat_page_and_item(self, page, item): + def treat_page_and_item(self, page, item) -> None: """Treat page/item.""" if item and item.exists(): pywikibot.output('{0} already has an item: {1}.' @@ -187,7 +185,7 @@ page, callback=lambda _, exc: self._callback(page, exc)) -def main(*args): +def main(*args) -> None: """ Process command line arguments and invoke bot. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611831 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ib8acdfb933cdbd6fe64c081419d8c8941b7bb82f Gerrit-Change-Number: 611831 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update movepages for py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611829 ) Change subject: Update movepages for py3 ...................................................................... Update movepages for py3 Bug: T257399 Change-Id: I0583b57faa8d92c755df198f1981eb33979c7a4d --- M scripts/movepages.py 1 file changed, 7 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/movepages.py b/scripts/movepages.py index 568c6e4..f6739dd 100755 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -36,17 +36,15 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import re import pywikibot +from pywikibot import i18n, pagegenerators +from pywikibot.bot import MultipleSitesBot from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.tools import issue_deprecation_warning -from pywikibot import i18n, pagegenerators -from pywikibot.bot import MultipleSitesBot # This is required for the text that is shown when you run this script # with the parameter -help. @@ -57,7 +55,7 @@ """Page move bot.""" - def __init__(self, generator, **kwargs): + def __init__(self, generator, **kwargs) -> None: """Initializer.""" self.availableOptions.update({ 'prefix': None, @@ -66,14 +64,14 @@ 'skipredirects': False, 'summary': None, }) - super(MovePagesBot, self).__init__(**kwargs) + super().__init__(**kwargs) self.generator = generator self.appendAll = False self.regexAll = False self.noNamespace = False - def moveOne(self, page, newPageTitle): + def moveOne(self, page, newPageTitle) -> None: """Move on page to newPageTitle.""" try: msg = self.getOption('summary') @@ -88,7 +86,7 @@ except pywikibot.PageRelatedError as error: pywikibot.output(error) - def treat(self, page): + def treat(self, page) -> None: """Treat a single page.""" self.current_page = page if self.getOption('skipredirects') and page.isRedirectPage(): @@ -174,7 +172,7 @@ self.moveOne(page, newPageTitle) -def main(*args): +def main(*args) -> None: """ Process command line arguments and invoke bot. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611829 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I0583b57faa8d92c755df198f1981eb33979c7a4d Gerrit-Change-Number: 611829 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update misspelling for py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611828 ) Change subject: Update misspelling for py3 ...................................................................... Update misspelling for py3 Bug: T257399 Change-Id: I075a48bf647447fd5bfa39d99d52b9920f597bbe --- M scripts/misspelling.py 1 file changed, 11 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/misspelling.py b/scripts/misspelling.py index 8288375..7a7c454 100755 --- a/scripts/misspelling.py +++ b/scripts/misspelling.py @@ -21,18 +21,16 @@ -main only check pages in the main namespace, not in the talk, wikipedia, user, etc. namespaces. """ -# (C) Pywikibot team, 2007-2019 +# (C) Pywikibot team, 2007-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - from itertools import chain +from typing import Generator import pywikibot from pywikibot import i18n, pagegenerators - from pywikibot.tools import UnicodeType from scripts.solve_disambiguation import DisambiguationRobot @@ -67,18 +65,14 @@ 'nl': 'Categorie:Wikipedia:Redirect voor spelfout', } - def __init__(self, always, firstPageTitle, main_only): + def __init__(self, always, firstPageTitle, main_only) -> None: """Initializer.""" - super(MisspellingRobot, self).__init__( - always, [], True, False, None, False, main_only) + super().__init__(always, [], True, False, None, False, main_only) self.generator = self.createPageGenerator(firstPageTitle) - def createPageGenerator(self, firstPageTitle): - """ - Generator to retrieve misspelling pages or misspelling redirects. - - @rtype: generator - """ + def createPageGenerator(self, firstPageTitle) -> Generator[pywikibot.Page, + None, None]: + """Generator to retrieve misspelling pages or misspelling redirects.""" mycode = self.site.code if mycode in self.misspellingCategory: categories = self.misspellingCategory[mycode] @@ -111,14 +105,13 @@ preloadingGen = pagegenerators.PreloadingGenerator(generator) return preloadingGen - def findAlternatives(self, disambPage): + def findAlternatives(self, disambPage) -> bool: """ Append link target to a list of alternative links. Overrides the DisambiguationRobot method. @return: True if alternate link was appended - @rtype: bool or None """ if disambPage.isRedirectPage(): self.alternatives.append(disambPage.getRedirectTarget().title()) @@ -142,8 +135,9 @@ # only one correct spelling. self.alternatives.append(correctSpelling) return True + return False - def setSummaryMessage(self, disambPage, *args, **kwargs): + def setSummaryMessage(self, disambPage, *args, **kwargs) -> None: """ Setup the summary message. @@ -155,7 +149,7 @@ {'page': disambPage.title()}) -def main(*args): +def main(*args) -> None: """ Process command line arguments and invoke bot. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611828 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I075a48bf647447fd5bfa39d99d52b9920f597bbe Gerrit-Change-Number: 611828 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update login for py3
by jenkins-bot (Code Review) 12 Jul '20

12 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611827 ) Change subject: Update login for py3 ...................................................................... Update login for py3 Bug: T257399 Change-Id: I968549f5347dd60465f3c0d88701b9adaf52a152 --- M scripts/login.py 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/login.py b/scripts/login.py index 4f2087a..ac95b19 100755 --- a/scripts/login.py +++ b/scripts/login.py @@ -57,19 +57,17 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - from os.path import join +from typing import Tuple import pywikibot from pywikibot import config - from pywikibot.exceptions import SiteDefinitionError from pywikibot.login import OauthLoginManager -def _get_consumer_token(site): +def _get_consumer_token(site) -> Tuple[str, str]: key_msg = 'OAuth consumer key on {0}:{1}'.format(site.code, site.family) key = pywikibot.input(key_msg) secret_msg = 'OAuth consumer secret for consumer {0}'.format(key) @@ -77,7 +75,7 @@ return key, secret -def _oauth_login(site): +def _oauth_login(site) -> None: consumer_key, consumer_secret = _get_consumer_token(site) login_manager = OauthLoginManager(consumer_secret, site, consumer_key) login_manager.login() @@ -105,7 +103,7 @@ 'oauth_token': oauth_token}) -def main(*args): +def main(*args) -> None: """ Process command line arguments and invoke bot. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611827 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I968549f5347dd60465f3c0d88701b9adaf52a152 Gerrit-Change-Number: 611827 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2020