Pywikibot-commits January 2021

pywikibot-commits@lists.wikimedia.org

1 participants
131 discussions

[Gerrit] ...core[master]: [IMPR] Use need_right decorator to check required user right

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/655892 ) Change subject: [IMPR] Use need_right decorator to check required user right ...................................................................... [IMPR] Use need_right decorator to check required user right Change-Id: Ic8da5864e365b8bc59d9432542c25a4cebbe8baf --- M pywikibot/site/__init__.py 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 348f34d..2cc9d63 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -4357,6 +4357,7 @@ return req.submit()['query']['stashimageinfo'][0] @deprecate_arg('imagepage', 'filepage') + @need_right('upload') def upload(self, filepage, source_filename=None, source_url=None, comment=None, text=None, watch=False, ignore_warnings=False, chunk_size: int = 0, _file_key: Optional[str] = None, @@ -4448,11 +4449,6 @@ # An offset != 0 doesn't make sense without a file key assert(_offset == 0 or _file_key is not None) - # check for required user right - if not self.has_right('upload'): - raise Error( - "User '%s' does not have upload rights on site %s." - % (self.user(), self)) # check for required parameters if bool(source_filename) == bool(source_url): raise ValueError('APISite.upload: must provide either ' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/655892 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: Ic8da5864e365b8bc59d9432542c25a4cebbe8baf Gerrit-Change-Number: 655892 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [cleanup] remove Page methods deprecated for 6 years

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/655868 ) Change subject: [cleanup] remove Page methods deprecated for 6 years ...................................................................... [cleanup] remove Page methods deprecated for 6 years Remove deprecated methods and properties: - latestRevision - pageAPInfo - previous_revision_id - previousRevision - isEmpty() - isFlowPage Change-Id: I264235b21a97748ed363436a25a061b2108318dd --- M pywikibot/page/__init__.py M tests/page_tests.py 2 files changed, 3 insertions(+), 60 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index b4d259f..3dc9015 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -11,7 +11,7 @@ """ # -# (C) Pywikibot team, 2008-2020 +# (C) Pywikibot team, 2008-2021 # # Distributed under the terms of the MIT license. # @@ -581,18 +581,6 @@ del self.latest_revision_id self._revid = value - @deprecated('latest_revision_id', since='20150727', future_warning=True) - def latestRevision(self): # pragma: no cover - """Return the current revision id for this page.""" - return self.latest_revision_id - - @deprecated('latest_revision_id', since='20150407', future_warning=True) - def pageAPInfo(self): # pragma: no cover - """Return the current revision id for this page.""" - if self.isRedirectPage(): - raise pywikibot.IsRedirectPage(self) - return self.latest_revision_id - @property def latest_revision(self): """Return the current revision for this page.""" @@ -740,27 +728,6 @@ """ return self.latest_revision.timestamp - @property - @deprecated('latest_revision.parent_id (0 instead of -1 when no parent)', - since='20150609', future_warning=True) - def previous_revision_id(self) -> int: # pragma: no cover - """ - Return the revision id for the previous revision of this Page. - - If the page has only one revision, it shall return -1. - """ - return self.latest_revision.parent_id or -1 - - @deprecated('latest_revision.parent_id (0 instead of -1 when no parent)', - since='20150609', future_warning=True) - def previousRevision(self) -> int: # pragma: no cover - """ - Return the revision id for the previous revision. - - DEPRECATED: Use latest_revision.parent_id instead. - """ - return self.latest_revision.parent_id or -1 - def exists(self) -> bool: """Return True if page exists on the wiki, even if it's a redirect. @@ -837,19 +804,6 @@ return Category(Link(self._catredirect, self.site)) raise pywikibot.IsNotRedirectPage(self) - @deprecated(since='20151207', future_warning=True) - def isEmpty(self) -> bool: # pragma: no cover - """ - Return True if the page text has less than 4 characters. - - Character count ignores language links and category links. - Can raise the same exceptions as get(). - """ - txt = self.get() - txt = textlib.removeLanguageLinks(txt, site=self.site) - txt = textlib.removeCategoryLinks(txt, site=self.site) - return len(txt) < 4 - def isTalkPage(self): """Return True if this page is in any talk namespace.""" ns = self.namespace() @@ -2095,11 +2049,6 @@ 'required.' % self.title(as_link=True)) return False - @deprecated('Page.is_flow_page()', since='20150128', future_warning=True) - def isFlowPage(self): # pragma: no cover - """DEPRECATED: use self.is_flow_page instead.""" - return self.is_flow_page() - def is_flow_page(self) -> bool: """Whether a page is a Flow page.""" return self.content_model == 'flow-board' diff --git a/tests/page_tests.py b/tests/page_tests.py index 1bc7743..b98782b 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- """Tests for the page module.""" # -# (C) Pywikibot team, 2008-2020 +# (C) Pywikibot team, 2008-2021 # # Distributed under the terms of the MIT license. # @@ -14,7 +13,6 @@ import pywikibot.page from pywikibot import config, InvalidTitle -from pywikibot.tools import suppress_warnings from tests.aspects import ( DefaultDrySiteTestCase, DefaultSiteTestCase, SiteAttributeTestCase, @@ -442,11 +440,7 @@ # since there is no way to predict what data the wiki will return, # we only check that the returned objects are of correct type. self.assertIsInstance(mainpage.get(), str) - with suppress_warnings( - r'pywikibot\.page\.BasePage\.latestRevision ' - r'is deprecated[\s\w]+; ' - r'use latest_revision_id instead\.'): - self.assertIsInstance(mainpage.latestRevision(), int) + self.assertIsInstance(mainpage.latest_revision_id, int) self.assertIsInstance(mainpage.userName(), str) self.assertIsInstance(mainpage.isIpEdit(), bool) self.assertIsInstance(mainpage.exists(), bool) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/655868 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: I264235b21a97748ed363436a25a061b2108318dd Gerrit-Change-Number: 655868 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: Don't print a FutureWarning until T271899 is solved

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/655878 ) Change subject: Don't print a FutureWarning until T271899 is solved ...................................................................... Don't print a FutureWarning until T271899 is solved Following the Deprecation/FutureWarning in APISite.upload() will raise a ValueError if ignore_warnings is boolean and report_success is set by default. Therefore don't show a FutureWarning anymore until T271899 has been solved finally. Bug: T271899 Change-Id: I8c17f44e910ab2399a5ad1daf4c1203fd994ac8b --- M pywikibot/site/__init__.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 348f34d..86394f6 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -4472,8 +4472,7 @@ '"report_success" is True or None', '"report_success=False" or define ' '"ignore_warnings" as callable/iterable', - 3, warning_class=FutureWarning, - since='20150823') + 3, since='20150823') if isinstance(ignore_warnings, Iterable): ignored_warnings = ignore_warnings -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/655878 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: I8c17f44e910ab2399a5ad1daf4c1203fd994ac8b Gerrit-Change-Number: 655878 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [bugfix] Add prefix to _IWEntry instance

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/655874 ) Change subject: [bugfix] Add prefix to _IWEntry instance ...................................................................... [bugfix] Add prefix to _IWEntry instance Change-Id: If50d978566ccc7f05d362b82b308ab8341d58770 --- M pywikibot/site/_interwikimap.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_interwikimap.py b/pywikibot/site/_interwikimap.py index ea894b0..18e41c2 100644 --- a/pywikibot/site/_interwikimap.py +++ b/pywikibot/site/_interwikimap.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- """Objects representing interwiki map of MediaWiki site.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # @@ -16,6 +15,7 @@ self._site = None self.local = local self.url = url + self.prefix = prefix @property def site(self): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/655874 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: If50d978566ccc7f05d362b82b308ab8341d58770 Gerrit-Change-Number: 655874 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] Create a Site with AutoFamily if a family isn't predefined

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/584919 ) Change subject: [IMPR] Create a Site with AutoFamily if a family isn't predefined ...................................................................... [IMPR] Create a Site with AutoFamily if a family isn't predefined This enables Site.interwiki() to create a Site object even the corresponding family file isn't predefined. Now the known_families dict and get_known_families method in Family object can be replaced as suggested because the Site object is created instead of raising SiteDefinitionError. - If a family is not predefined in family folder use AutoFamily to create the family within _code_fam_from_url. - A new parameter "name" is used for the family name. Create the family name from url if name isn't given. - Store prefix in IWEntry that it can be reused for AutoFamily name. Bug: T249087 Change-Id: Ic7fb876570a15a5808b5fd56cafa5c3335013955 --- M pywikibot/__init__.py M pywikibot/site/_interwikimap.py 2 files changed, 20 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index b2dc8ff..5b60012 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -16,6 +16,7 @@ from decimal import Decimal from queue import Queue from typing import Optional, Union +from urllib.parse import urlparse from warnings import warn from pywikibot.__metadata__ import ( @@ -23,7 +24,7 @@ __maintainer__, __maintainer_email__, __name__, __url__, __version__) from pywikibot._wbtypes import WbRepresentation as _WbRepresentation -from pywikibot.backports import cache +from pywikibot.backports import cache, removesuffix from pywikibot.bot import ( input, input_choice, input_yn, handle_args, show_help, ui, calledModuleName, Bot, CurrentPageBot, WikidataBot, @@ -48,7 +49,7 @@ UnknownExtension, UnknownFamily, UnknownSite, UnsupportedPage, WikiBaseError, ) -from pywikibot.family import Family +from pywikibot.family import AutoFamily, Family from pywikibot.i18n import translate from pywikibot.logging import ( critical, debug, error, exception, log, output, stdout, warning @@ -1050,12 +1051,12 @@ @cache -def _code_fam_from_url(url: str): +def _code_fam_from_url(url: str, name: Optional[str] = None): """Set url to cache and get code and family from cache. Site helper method. @param url: The site URL to get code and family - @raises pywikibot.exceptions.SiteDefinitionError: Unknown URL + @param name: A family name used by AutoFamily """ matched_sites = [] # Iterate through all families and look, which does apply to @@ -1067,9 +1068,12 @@ matched_sites.append((code, family)) if not matched_sites: - # TODO: As soon as AutoFamily is ready, try and use an - # AutoFamily - raise SiteDefinitionError("Unknown URL '{}'.".format(url)) + if not name: # create a name from url + name = urlparse(url).netloc.split('.')[-2] + name = removesuffix(name, 'wiki') + family = AutoFamily(name, url) + matched_sites.append((family.code, family)) + if len(matched_sites) > 1: warning('Found multiple matches for URL "{}": {} (use first)' .format(url, ', '.join(str(s) for s in matched_sites))) @@ -1099,17 +1103,16 @@ URL. Still requires that the family supporting that URL exists. @raises ValueError: URL and pair of code and family given @raises ValueError: Invalid interface name - @raises pywikibot.exceptions.SiteDefinitionError: Unknown URL """ _logger = 'wiki' if url: - # Either code and fam or only url - if code or fam: + # Either code and fam or url with optional fam for AutoFamily name + if code: raise ValueError( 'URL to the wiki OR a pair of code and family name ' 'should be provided') - code, fam = _code_fam_from_url(url) + code, fam = _code_fam_from_url(url, fam) elif code and ':' in code: if fam: raise ValueError( diff --git a/pywikibot/site/_interwikimap.py b/pywikibot/site/_interwikimap.py index 2f18e54..ea894b0 100644 --- a/pywikibot/site/_interwikimap.py +++ b/pywikibot/site/_interwikimap.py @@ -12,7 +12,7 @@ """An entry of the _InterwikiMap with a lazy loading site.""" - def __init__(self, local, url): + def __init__(self, local, url, prefix=None): self._site = None self.local = local self.url = url @@ -21,7 +21,8 @@ def site(self): if self._site is None: try: - self._site = pywikibot.Site(url=self.url) + self._site = pywikibot.Site( + url=self.url, fam=None if self.local else self.prefix) except Exception as e: self._site = e return self._site @@ -52,7 +53,9 @@ # _iw_sites is a local cache to return an APISite instance depending # on the interwiki prefix of that site if self._map is None: - self._map = {iw['prefix']: _IWEntry('local' in iw, iw['url']) + self._map = {iw['prefix']: _IWEntry('local' in iw, + iw['url'], + iw['prefix']) for iw in self._site.siteinfo['interwikimap']} return self._map -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/584919 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: Ic7fb876570a15a5808b5fd56cafa5c3335013955 Gerrit-Change-Number: 584919 Gerrit-PatchSet: 8 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] Improvements for solve_disambiguation.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638038 ) Change subject: [IMPR] Improvements for solve_disambiguation.py ...................................................................... [IMPR] Improvements for solve_disambiguation.py Prepare solve_disambiguation.py for importing DisambigBotBase from specialbots Patch detached 51c3b50 Bug: T266997 Change-Id: Ib150852faac9a801d1f5ebb493ef686377a51c4c --- M scripts/solve_disambiguation.py 1 file changed, 187 insertions(+), 172 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index a806836..aa61450 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -86,7 +86,7 @@ from contextlib import suppress from itertools import chain -from typing import Generator, Optional +from typing import Generator, Optional, Tuple import pywikibot @@ -96,8 +96,7 @@ from pywikibot.backports import List 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 import deprecated, first_lower, first_upper from pywikibot.tools.formatter import SequenceOutputter @@ -366,13 +365,12 @@ } -def correctcap(link, text) -> str: +def correctcap(link, text: str) -> str: """Return the link capitalized/uncapitalized according to the text. @param link: link page @type link: pywikibot.Page @param text: the wikitext that is supposed to refer to the link - @type text: str @return: uncapitalized title of the link if the text links to the link with an uncapitalized title, else capitalized """ @@ -388,35 +386,33 @@ """Referring Page generator, with an ignore manager.""" - def __init__(self, disambPage, primary=False, minimum=0, main_only=False + def __init__(self, page, primary=False, minimum=0, main_only=False ) -> None: """Initializer. - @type disambPage: pywikibot.Page + @type page: pywikibot.Page @type primary: bool @type minimum: int @type main_only: bool """ - self.disambPage = disambPage + self.page = page # if run with the -primary argument, enable the ignore manager - self.primaryIgnoreManager = PrimaryIgnoreManager(disambPage, - enabled=primary) + self.primaryIgnoreManager = PrimaryIgnoreManager(page, enabled=primary) self.minimum = minimum self.main_only = main_only 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( - with_template_inclusion=False, - namespaces=0 if self.main_only else None)) + refs = list(self.page.getReferences(with_template_inclusion=False, + namespaces=0 if self.main_only + else None)) pywikibot.output('Found {0} references.'.format(len(refs))) # Remove ignorables - if self.disambPage.site.family.name in ignore_title and \ - self.disambPage.site.lang in ignore_title[ - self.disambPage.site.family.name]: - for ig in ignore_title[self.disambPage.site.family.name - ][self.disambPage.site.lang]: + site = self.page.site + if site.family.name in ignore_title \ + and site.lang in ignore_title[site.family.name]: + for ig in ignore_title[site.family.name][site.lang]: for i in range(len(refs) - 1, -1, -1): if re.match(ig, refs[i].title()): pywikibot.log('Ignoring page ' + refs[i].title()) @@ -442,15 +438,15 @@ """ - def __init__(self, disambPage, enabled=False) -> None: + def __init__(self, disamb_page, enabled=False) -> None: """Initializer. - @type disambPage: pywikibot.Page + @type disamb_page: pywikibot.Page @type enabled: bool @rtype: None """ - self.disambPage = disambPage + self.disamb_page = disamb_page self.enabled = enabled self.ignorelist = set() @@ -464,7 +460,7 @@ @type folder: str """ filename = os.path.join( - folder, self.disambPage.title(as_filename=True) + '.txt') + folder, self.disamb_page.title(as_filename=True) + '.txt') with suppress(IOError): # The file is stored in the disambiguation/ subdir. # Create if necessary. @@ -476,14 +472,14 @@ if line: self.ignorelist.add(line) - def isIgnored(self, refPage) -> bool: - """Return if refPage is to be ignored. + def isIgnored(self, ref_page) -> bool: + """Return if ref_page is to be ignored. - @type refPage: pywikibot.Page + @type ref_page: pywikibot.Page """ - return self.enabled and refPage.title(as_url=True) in self.ignorelist + return self.enabled and ref_page.title(as_url=True) in self.ignorelist - def ignore(self, page_titles): + def ignore(self, page_titles) -> None: """Write pages to ignorelist. @param page_titles: page titles to be ignored @@ -496,7 +492,7 @@ # Skip this occurrence next time. filename = config.datafilepath( 'disambiguations', - self.disambPage.title(as_url=True) + '.txt') + self.disamb_page.title(as_url=True) + '.txt') with suppress(IOError): # Open file for appending. If none exists, create a new one. with codecs.open(filename, 'a', 'utf-8') as f: @@ -509,8 +505,8 @@ def result(self, value) -> None: """Add the alternative and then list them.""" - newAlternative = pywikibot.input('New alternative:') - self._outputter.sequence.append(newAlternative) + new_alternative = pywikibot.input('New alternative:') + self._outputter.sequence.append(new_alternative) super().result(value) @@ -621,14 +617,39 @@ self.main_only = main_only self.first_only = first_only self.minimum = minimum + self.summary = None - self.mysite = self.site - self.mylang = self.mysite.lang - self.comment = None + self.dn_template_str = i18n.translate(self.site, dn_template) - self.dn_template_str = i18n.translate(self.mysite, dn_template) + @property + @deprecated('site attribute', since='20201102', future_warning=True) + def mysite(self): + """DEPRECATED mysite attribute.""" + return self.site - self.setupRegexes() + @mysite.setter + @deprecated('site attribute', since='20201102', future_warning=True) + def mysite(self, value): + """DEPRECATED mysite attribute.""" + self.site = value + + @property + @deprecated('site.lang attribute', since='20201102', future_warning=True) + def mylang(self): + """DEPRECATED mylang attribute.""" + return self.site.lang + + @property + @deprecated('summary attribute', since='20201102', future_warning=True) + def comment(self): + """DEPRECATED edit summary property.""" + return self.summary + + @comment.setter + @deprecated('summary attribute', since='20201102', future_warning=True) + def comment(self, value): + """DEPRECATED edit summary property setter.""" + self.summary = value def checkContents(self, text) -> Optional[str]: """ @@ -658,14 +679,14 @@ i for i in self.alternatives if i not in seen and not seen.add(i) ] - def setupRegexes(self) -> None: + def setup(self) -> None: """Compile regular expressions.""" self.ignore_contents_regexes = [] - if self.mylang in self.ignore_contents: - for ig in self.ignore_contents[self.mylang]: + if self.site.lang in self.ignore_contents: + for ig in self.ignore_contents[self.site.lang]: self.ignore_contents_regexes.append(re.compile(ig)) - linktrail = self.mysite.linktrail() + linktrail = self.site.linktrail() self.trailR = re.compile(linktrail) # The regular expression which finds links. Results consist of four # groups: @@ -708,30 +729,30 @@ disambiguation pages and leave the first link of each asterisked line only. This must be done if -first is used in command line. """ - titles = {firstcap(t) for t in self.firstlinks(page)} + titles = {first_upper(t) for t in self.firstlinks(page)} links = list(links) for link in links[:]: # uses a copy because of remove! if link.title() not in titles: links.remove(link) return links - def treat_links(self, refPage, disambPage) -> bool: - """Resolve the links to disambPage or its redirects. + def treat_links(self, ref_page, disamb_page) -> bool: + """Resolve the links to disamb_page or its redirects. - @param disambPage: the disambiguation page or redirect we don't want + @param disamb_page: the disambiguation page or redirect we don't want anything to link to - @type disambPage: pywikibot.Page - @param refPage: a page linking to disambPage - @type refPage: pywikibot.Page + @type disamb_page: pywikibot.Page + @param ref_page: a page linking to disamb_page + @type ref_page: pywikibot.Page @return: Return whether continue with next page (True) or next disambig (False) """ nochange = True for page in chain( - (disambPage,), disambPage.getReferences(filter_redirects=True) + (disamb_page,), disamb_page.getReferences(filter_redirects=True) ): - treat_result = self.treat_disamb_only(refPage, page) + treat_result = self.treat_disamb_only(ref_page, page) if treat_result == 'nextpage': return True if treat_result == 'nextdisambig': @@ -740,74 +761,74 @@ nochange = False if nochange: - pywikibot.output('No changes necessary in ' + refPage.title()) + pywikibot.output('No changes necessary in ' + ref_page.title()) return True - def treat_disamb_only(self, refPage, disambPage) -> str: - """Resolve the links to disambPage but don't look for its redirects. + def treat_disamb_only(self, ref_page, disamb_page) -> str: + """Resolve the links to disamb_page but don't look for its redirects. - @param disambPage: the disambiguation page or redirect we don't want + @param disamb_page: the disambiguation page or redirect we don't want anything to link to - @type disambPage: pywikibot.Page - @param refPage: a page linking to disambPage - @type refPage: pywikibot.Page + @type disamb_page: pywikibot.Page + @param ref_page: a page linking to disamb_page + @type ref_page: pywikibot.Page @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 """ # TODO: break this function up into subroutines! - self.current_page = refPage + self.current_page = ref_page include = False unlink_counter = 0 new_targets = [] try: - text = refPage.get() - ignoreReason = self.checkContents(text) - if ignoreReason: + text = ref_page.get() + ignore_reason = self.checkContents(text) + if ignore_reason: pywikibot.output( '\n\nSkipping {0} because it contains {1}.\n\n' - .format(refPage.title(), ignoreReason)) + .format(ref_page.title(), ignore_reason)) else: include = True except pywikibot.IsRedirectPage: pywikibot.output('{0} is a redirect to {1}' - .format(refPage.title(), disambPage.title())) - if disambPage.isRedirectPage(): + .format(ref_page.title(), disamb_page.title())) + if disamb_page.isRedirectPage(): target = self.alternatives[0] if pywikibot.input_yn( 'Do you want to make redirect {0} point to {1}?' - .format(refPage.title(), target), + .format(ref_page.title(), target), default=False, automatic_quit=False): redir_text = '#{0} [[{1}]]' \ - .format(self.mysite.redirect(), target) + .format(self.site.redirect(), target) try: - refPage.put(redir_text, summary=self.comment, - asynchronous=True) + ref_page.put(redir_text, summary=self.summary, + asynchronous=True) except pywikibot.PageSaveRelatedError as error: pywikibot.output('Page not saved: {0}' .format(error.args)) else: choice = pywikibot.input_choice( 'Do you want to work on pages linking to {0}?' - .format(refPage.title()), + .format(ref_page.title()), [('yes', 'y'), ('no', 'n'), ('change redirect', 'c')], 'n', automatic_quit=False) if choice == 'y': gen = ReferringPageGeneratorWithIgnore( - refPage, self.primary, main_only=self.main_only + ref_page, self.primary, main_only=self.main_only ) - preloadingGen = pagegenerators.PreloadingGenerator(gen) - for refPage2 in preloadingGen: + gen = pagegenerators.PreloadingGenerator(gen) + for ref_page2 in gen: # run until the user selected 'quit' - self.treat_links(refPage2, refPage) + self.treat_links(ref_page2, ref_page) elif choice == 'c': - text = refPage.get(get_redirect=True) + text = ref_page.get(get_redirect=True) include = 'redirect' except pywikibot.NoPage: pywikibot.output( 'Page [[{0}]] does not seem to exist?! Skipping.' - .format(refPage.title())) + .format(ref_page.title())) include = False if include in (True, 'redirect'): # save the original text so we can show the changes later @@ -831,24 +852,24 @@ curpos = m.start() + 1 try: foundlink = pywikibot.Link(m.group('title'), - disambPage.site) + disamb_page.site) foundlink.parse() except pywikibot.Error: continue # ignore interwiki links - if foundlink.site != disambPage.site: + if foundlink.site != disamb_page.site: continue - # Check whether the link found is to disambPage. + # Check whether the link found is to disamb_page. try: - if foundlink.canonical_title() != disambPage.title(): + if foundlink.canonical_title() != disamb_page.title(): continue except pywikibot.Error: # must be a broken link pywikibot.log('Invalid link [[%s]] in page [[%s]]' - % (m.group('title'), refPage.title())) + % (m.group('title'), ref_page.title())) continue n += 1 @@ -863,7 +884,7 @@ continue edit = EditOption('edit page', 'e', text, m.start(), - disambPage.title()) + disamb_page.title()) context_option = HighlightContextOption( 'more context', 'm', text, 60, start=m.start(), end=m.end()) @@ -885,7 +906,7 @@ options += [context_option] if not edited: options += [ShowPageOption('show disambiguation page', 'd', - m.start(), disambPage)] + m.start(), disamb_page)] options += [ OutputProxyOption('list', 'l', @@ -918,7 +939,7 @@ if self.primary: # If run with the -primary argument, skip this # occurrence next time. - self.ignores.add(refPage.title(as_url=True)) + self.ignores.add(ref_page.title(as_url=True)) return 'nextpage' if answer == 'g': @@ -979,12 +1000,11 @@ replaceit = include == 'redirect' new_page_title = answer[1] - repPl = pywikibot.Page(pywikibot.Link(new_page_title, - disambPage.site)) - if new_page_title[0].isupper() or link_text[0].isupper(): - new_page_title = repPl.title() - else: - new_page_title = repPl.title() + rep = pywikibot.Page(pywikibot.Link(new_page_title, + disamb_page.site)) + new_page_title = rep.title() + if not (new_page_title[0].isupper() + or link_text[0].isupper()): new_page_title = first_lower(new_page_title) if new_page_title not in new_targets: @@ -1001,8 +1021,8 @@ # instead of a pipelink elif ( (len(new_page_title) <= len(link_text)) - and (firstcap(link_text[:len(new_page_title)]) - == firstcap(new_page_title)) + and (first_upper(link_text[:len(new_page_title)]) + == first_upper(new_page_title)) and (self.trailR.sub( '', link_text[len(new_page_title):]) == '') and (not section) @@ -1023,10 +1043,10 @@ pywikibot.showDiff(original_text, text) pywikibot.output('') # save the page - self.setSummaryMessage(disambPage, new_targets, unlink_counter, - dn) + self.setSummaryMessage(disamb_page, new_targets, + unlink_counter, dn) try: - refPage.put(text, summary=self.comment, asynchronous=True) + ref_page.put(text, summary=self.summary, asynchronous=True) except pywikibot.LockedPage: pywikibot.output('Page not saved: page is locked') except pywikibot.PageSaveRelatedError as error: @@ -1034,45 +1054,45 @@ return 'done' - def findAlternatives(self, disambPage) -> bool: + def findAlternatives(self, page) -> bool: """Extend self.alternatives using correctcap of disambPage.linkedPages. - @param disambPage: the disambiguation page - @type disambPage: pywikibot.Page + @param page: the disambiguation page + @type page: pywikibot.Page @return: True if everything goes fine, False otherwise """ - if disambPage.isRedirectPage() and not self.primary: - primary = i18n.translate(disambPage.site, + if page.isRedirectPage() and not self.primary: + primary = i18n.translate(page.site, self.primary_redir_template) if primary: - primary_page = pywikibot.Page(disambPage.site, + primary_page = pywikibot.Page(page.site, 'Template:' + primary) - if primary and primary_page in disambPage.templates(): - baseTerm = disambPage.title() - for template, params in disambPage.templatesWithParams(): + if primary and primary_page in page.templates(): + baseTerm = page.title() + for template, params in page.templatesWithParams(): if params and template == primary_page: baseTerm = params[1] break - disambTitle = primary_topic_format[self.mylang] % baseTerm + disambTitle = primary_topic_format[self.site.lang] % baseTerm try: - disambPage2 = pywikibot.Page( - pywikibot.Link(disambTitle, self.mysite)) - links = disambPage2.linkedPages() + page2 = pywikibot.Page( + pywikibot.Link(disambTitle, self.site)) + links = page2.linkedPages() if self.first_only: - links = self.firstize(disambPage2, links) - links = [correctcap(link, disambPage2.get()) + links = self.firstize(page2, links) + links = [correctcap(link, page2.get()) for link in links] except pywikibot.NoPage: pywikibot.output('No page at {0}, using redirect target.' .format(disambTitle)) - links = disambPage.linkedPages()[:1] + links = page.linkedPages()[:1] links = [correctcap(link, - disambPage.get(get_redirect=True)) + page.get(get_redirect=True)) for link in links] self.alternatives += links else: try: - target = disambPage.getRedirectTarget().title() + target = page.getRedirectTarget().title() self.alternatives.append(target) except pywikibot.NoPage: pywikibot.output('The specified page was not found.') @@ -1088,33 +1108,33 @@ 'The specified page is not a redirect. Skipping.') return False elif self.getAlternatives: - # not disambPage.isRedirectPage() or self.primary + # not page.isRedirectPage() or self.primary try: if self.primary: try: - disambPage2 = pywikibot.Page( + page2 = pywikibot.Page( pywikibot.Link( - primary_topic_format[self.mylang] - % disambPage.title(), - self.mysite)) - links = disambPage2.linkedPages() + primary_topic_format[self.site.lang] + % page.title(), + self.site)) + links = page2.linkedPages() if self.first_only: - links = self.firstize(disambPage2, links) - links = [correctcap(link, disambPage2.get()) + links = self.firstize(page2, links) + links = [correctcap(link, page2.get()) for link in links] except pywikibot.NoPage: pywikibot.output( 'Page does not exist; using first ' - 'link in page {0}.'.format(disambPage.title())) - links = disambPage.linkedPages()[:1] - links = [correctcap(link, disambPage.get()) + 'link in page {0}.'.format(page.title())) + links = page.linkedPages()[:1] + links = [correctcap(link, page.get()) for link in links] else: try: - links = disambPage.linkedPages() + links = page.linkedPages() if self.first_only: - links = self.firstize(disambPage, links) - links = [correctcap(link, disambPage.get()) + links = self.firstize(page, links) + links = [correctcap(link, page.get()) for link in links] except pywikibot.NoPage: pywikibot.output('Page does not exist, skipping.') @@ -1125,68 +1145,68 @@ self.alternatives += links return True - def setSummaryMessage(self, disambPage, new_targets=[], unlink_counter=0, + def setSummaryMessage(self, page, new_targets=[], unlink_counter=0, dn=False) -> None: """Setup i18n summary message.""" # make list of new targets - comma = self.mysite.mediawiki_message('comma-separator') + comma = self.site.mediawiki_message('comma-separator') targets = comma.join('[[{0}]]'.format(page_title) for page_title in new_targets) if not targets: - targets = i18n.twtranslate(self.mysite, + targets = i18n.twtranslate(self.site, 'solve_disambiguation-unknown-page') # first check whether user has customized the edit comment - if (self.mysite.family.name in config.disambiguation_comment - and self.mylang in config.disambiguation_comment[ - self.mysite.family.name]): + if (self.site.family.name in config.disambiguation_comment + and self.site.lang in config.disambiguation_comment[ + self.site.family.name]): try: - self.comment = i18n.translate( - self.mysite, - config.disambiguation_comment[self.mysite.family.name], - fallback=True) % (disambPage.title(), targets) + self.summary = i18n.translate( + self.site, + config.disambiguation_comment[self.site.family.name], + fallback=True) % (page.title(), targets) # Backwards compatibility, type error probably caused by too # many arguments for format string except TypeError: - self.comment = i18n.translate( - self.mysite, - config.disambiguation_comment[self.mysite.family.name], - fallback=True) % disambPage.title() - elif disambPage.isRedirectPage(): + self.summary = i18n.translate( + self.site, + config.disambiguation_comment[self.site.family.name], + fallback=True) % page.title() + elif page.isRedirectPage(): # when working on redirects, there's another summary message if unlink_counter and not new_targets: - self.comment = i18n.twtranslate( - self.mysite, + self.summary = i18n.twtranslate( + self.site, 'solve_disambiguation-redirect-removed', - {'from': disambPage.title(), + {'from': page.title(), 'count': unlink_counter}) elif dn and not new_targets: - self.comment = i18n.twtranslate( - self.mysite, + self.summary = i18n.twtranslate( + self.site, 'solve_disambiguation-redirect-adding-dn-template', - {'from': disambPage.title()}) + {'from': page.title()}) else: - self.comment = i18n.twtranslate( - self.mysite, 'solve_disambiguation-redirect-resolved', - {'from': disambPage.title(), + self.summary = i18n.twtranslate( + self.site, 'solve_disambiguation-redirect-resolved', + {'from': page.title(), 'to': targets, 'count': len(new_targets)}) else: if unlink_counter and not new_targets: - self.comment = i18n.twtranslate( - self.mysite, 'solve_disambiguation-links-removed', - {'from': disambPage.title(), + self.summary = i18n.twtranslate( + self.site, 'solve_disambiguation-links-removed', + {'from': page.title(), 'count': unlink_counter}) elif dn and not new_targets: - self.comment = i18n.twtranslate( - self.mysite, 'solve_disambiguation-adding-dn-template', - {'from': disambPage.title()}) + self.summary = i18n.twtranslate( + self.site, 'solve_disambiguation-adding-dn-template', + {'from': page.title()}) else: - self.comment = i18n.twtranslate( - self.mysite, 'solve_disambiguation-links-resolved', - {'from': disambPage.title(), + self.summary = i18n.twtranslate( + self.site, 'solve_disambiguation-links-resolved', + {'from': page.title(), 'to': targets, 'count': len(new_targets)}) @@ -1217,24 +1237,23 @@ minimum=self.minimum, main_only=self.main_only ) - preloadingGen = pagegenerators.PreloadingGenerator(gen) - for refPage in preloadingGen: - if not self.primaryIgnoreManager.isIgnored(refPage): - if not self.treat_links(refPage, page): + gen = pagegenerators.PreloadingGenerator(gen) + for ref_page in gen: + if not self.primaryIgnoreManager.isIgnored(ref_page): + if not self.treat_links(ref_page, page): break # next disambig # clear alternatives before working on next disambiguation page self.alternatives = [] -def main(*args) -> None: +def main(*args: Tuple[str, ...]) -> None: """ Process command line arguments and invoke bot. If args is an empty list, sys.argv is used. @param args: command line arguments - @type args: str """ # the option that's always selected when the bot wonders what to do with # a link. If it's None, the user is prompted (default behaviour). @@ -1251,6 +1270,8 @@ minimum = 0 local_args = pywikibot.handle_args(args) + site = pywikibot.Site() + generator_factory = pagegenerators.GeneratorFactory( positional_arg_name='page') @@ -1265,12 +1286,11 @@ always = value elif arg == '-pos': if not value: - pass - elif value.startswith(':'): + continue + if value.startswith(':'): alternatives.append(value) else: - mysite = pywikibot.Site() - page = pywikibot.Page(pywikibot.Link(value, mysite)) + page = pywikibot.Page(pywikibot.Link(value, site)) if page.exists(): alternatives.append(page.title()) elif pywikibot.input_yn( @@ -1300,16 +1320,11 @@ else: generator_factory.handleArg(argument) - site = pywikibot.Site() - generator = generator_factory.getCombinedGenerator(generator) - if not generator: pywikibot.bot.suggest_help(missing_generator=True) return - site.login() - bot = DisambiguationRobot(always, alternatives, getAlternatives, dnSkip, generator, primary, main_only, first_only, minimum=minimum) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638038 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: Ib150852faac9a801d1f5ebb493ef686377a51c4c Gerrit-Change-Number: 638038 Gerrit-PatchSet: 9 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] Avoid deeply nested flow statement in category.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/654888 ) Change subject: [IMPR] Avoid deeply nested flow statement in category.py ...................................................................... [IMPR] Avoid deeply nested flow statement in category.py Change-Id: If2740960043a985fa8338c250bfba1d31aa46d63 --- M scripts/category.py 1 file changed, 28 insertions(+), 23 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index 418a4ff..a0f86dd 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -1,5 +1,4 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- """ Script to manage categories. @@ -113,7 +112,7 @@ This will move all pages in the category US to the category United States. """ # -# (C) Pywikibot team, 2004-2020 +# (C) Pywikibot team, 2004-2021 # # Distributed under the terms of the MIT license. # @@ -247,32 +246,38 @@ @type page: pywikibot.Page @return: Page to be categorized. """ + if page.namespace() != page.site.namespaces.TEMPLATE: + self.includeonly = [] + return page + + try: + tmpl, loc = moved_links[page.site.code] + except KeyError: + tmpl = [] + + if not isinstance(tmpl, list): + tmpl = [tmpl] + includeonly = [] - if page.namespace() == page.site.namespaces.TEMPLATE: - try: - tmpl, loc = moved_links[page.site.code] - except KeyError: - tmpl = [] - if not isinstance(tmpl, list): - tmpl = [tmpl] - if tmpl != []: - templates = page.templatesWithParams() - for template, params in templates: - if (template.title(with_ns=False).lower() in tmpl - and params): - doc_page = pywikibot.Page(page.site, params[0]) - if doc_page.exists(): - page = doc_page - includeonly = ['includeonly'] - break - if includeonly == []: - docs = page.site.doc_subpage # return tuple - for doc in docs: - doc_page = pywikibot.Page(page.site, page.title() + doc) + if tmpl: + templates = page.templatesWithParams() + for template, params in templates: + if template.title(with_ns=False).lower() in tmpl and params: + doc_page = pywikibot.Page(page.site, params[0]) if doc_page.exists(): page = doc_page includeonly = ['includeonly'] break + + if not includeonly: + docs = page.site.doc_subpage # return tuple + for doc in docs: + doc_page = pywikibot.Page(page.site, page.title() + doc) + if doc_page.exists(): + page = doc_page + includeonly = ['includeonly'] + break + self.includeonly = includeonly return page -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/654888 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: If2740960043a985fa8338c250bfba1d31aa46d63 Gerrit-Change-Number: 654888 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)disroot.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] Avoid deeply nested flow statement in download_dump.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/654883 ) Change subject: [IMPR] Avoid deeply nested flow statement in download_dump.py ...................................................................... [IMPR] Avoid deeply nested flow statement in download_dump.py Change-Id: I3b74e16763ac78370aea3e2b8c5cb25383f0f537 --- M scripts/download_dump.py 1 file changed, 41 insertions(+), 46 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/download_dump.py b/scripts/download_dump.py index 54931f9..b0d1e03 100644 --- a/scripts/download_dump.py +++ b/scripts/download_dump.py @@ -1,5 +1,4 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- """ This bot downloads dump from dumps.wikimedia.org. @@ -14,7 +13,7 @@ """ # -# (C) Pywikibot team, 2017-2020 +# (C) Pywikibot team, 2017-2021 # # Distributed under the terms of the MIT license. # @@ -108,55 +107,51 @@ download_filename) pywikibot.output('Downloading file from ' + url) response = fetch(url, stream=True) - if response.status_code == 200: - with open(file_current_storepath, 'wb') as result_file: - try: - total = int(response.response_headers[ - 'content-length']) - except KeyError: - pywikibot.exception() - total = -1 - downloaded = 0 - parts = 50 - display_string = '' - pywikibot.output('') - for data in response.data.iter_content(100 * 1024): - result_file.write(data) - - if total <= 0: - continue - - downloaded += len(data) - done = int(parts * downloaded / total) - display = map(convert_from_bytes, - (downloaded, total)) - prior_display = display_string - display_string = '\r|{}{}|{}{}/{}'.format( - '=' * done, - '-' * (parts - done), - ' ' * 5, - *display) - # Add whitespace to cover up prior bar - display_string += ' ' * ( - len(prior_display.rstrip()) - - len(display_string.rstrip())) - - pywikibot.output(display_string, newline=False) - pywikibot.output('') - else: + if response.status_code != 200: if response.status_code == 404: pywikibot.output( - 'File with name "{filename}", ' - 'from dumpdate "{dumpdate}", ' - 'and wiki "{wikiname}" ({url}) isn\'t ' - 'available in the Wikimedia Dumps'.format( - filename=self.opt.filename, - dumpdate=self.opt.dumpdate, - url=url, - wikiname=self.opt.wikiname)) + 'File with name {filename!r}, from dumpdate ' + '{dumpdate!r}, and wiki {wikiname!r} ({url}) ' + "isn't available in the Wikimedia Dumps" + .format(url=url, **self.opt)) return + with open(file_current_storepath, 'wb') as result_file: + total = int(response.response_headers.get( + 'content-length', -1)) + if total == -1: + pywikibot.warning("'content-length' missing in " + 'response headers') + downloaded = 0 + parts = 50 + display_string = '' + + pywikibot.output('') + for data in response.data.iter_content(100 * 1024): + result_file.write(data) + + if total <= 0: + continue + + downloaded += len(data) + done = int(parts * downloaded / total) + display = map(convert_from_bytes, + (downloaded, total)) + prior_display = display_string + display_string = '\r|{}{}|{}{}/{}'.format( + '=' * done, + '-' * (parts - done), + ' ' * 5, + *display) + # Add whitespace to cover up prior bar + display_string += ' ' * ( + len(prior_display.rstrip()) + - len(display_string.rstrip())) + + pywikibot.output(display_string, newline=False) + pywikibot.output('') + # Rename the temporary file to the target file # if the download completes successfully if not non_atomic: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/654883 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: I3b74e16763ac78370aea3e2b8c5cb25383f0f537 Gerrit-Change-Number: 654883 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Rafidaslam <rafidteam(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] Avoid deeply nested flow statements in redirect.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/654869 ) Change subject: [IMPR] Avoid deeply nested flow statements in redirect.py ...................................................................... [IMPR] Avoid deeply nested flow statements in redirect.py Change-Id: I9b1cc85262630c59b5f1726bac839be65878352e --- M scripts/redirect.py 1 file changed, 24 insertions(+), 30 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index 9b07caf..80fa4de 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -1,5 +1,4 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- """ Script to resolve double redirects, and to delete broken redirects. @@ -70,7 +69,7 @@ """ # -# (C) Pywikibot team, 2004-2020 +# (C) Pywikibot team, 2004-2021 # # Distributed under the terms of the MIT license. # @@ -256,24 +255,21 @@ for x in data['query']['redirects']} for pagetitle in data['query']['pages'].values(): - if 'missing' in pagetitle and 'pageid' not in pagetitle: - pages[pagetitle['title']] = False - else: - pages[pagetitle['title']] = True + pages[pagetitle['title']] = \ + 'missing' not in pagetitle or 'pageid' in pagetitle for redirect in redirects: target = redirects[redirect] - result = 0 + result = None final = None - try: - if pages[target]: - final = target - with suppress(KeyError): - while result <= maxlen: - result += 1 - final = redirects[final] - # result = None - except KeyError: - result = None + + if pages.get(target): + result = 0 + final = target + with suppress(KeyError): + while result <= maxlen: + result += 1 + final = redirects[final] + yield (redirect, result, target, final) def retrieve_broken_redirects(self) -> Generator[ @@ -281,14 +277,13 @@ """Retrieve broken redirects.""" if self.opt.fullscan: count = 0 - for (pagetitle, type, target, final) \ - in self.get_redirects_via_api(maxlen=2): + for pagetitle, type, target, final in self.get_redirects_via_api( + maxlen=2): if type == 0: yield pagetitle - if self.opt.limit: - count += 1 - if count >= self.opt.limit: - break + count += 1 + if self.opt.limit and count >= self.opt.limit: + break elif self.opt.xml: # retrieve information from XML dump pywikibot.output( @@ -311,14 +306,13 @@ yield from self.get_moved_pages_redirects() elif self.opt.fullscan: count = 0 - for (pagetitle, type, target, final) \ - in self.get_redirects_via_api(maxlen=2): - if type != 0 and type != 1: + for pagetitle, type_, target, final in self.get_redirects_via_api( + maxlen=2): + if type_ != 0 and type_ != 1: yield pagetitle - if self.opt.limit: - count += 1 - if count >= self.opt.limit: - break + count += 1 + if self.opt.limit and count >= self.opt.limit: + break elif self.opt.xml: redict, _ = self.get_redirects_from_dump() total = len(redict) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/654869 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: I9b1cc85262630c59b5f1726bac839be65878352e Gerrit-Change-Number: 654869 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] Use pagegenerators -page option in redirect.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/654468 ) Change subject: [IMPR] Use pagegenerators -page option in redirect.py ...................................................................... [IMPR] Use pagegenerators -page option in redirect.py Bug: T100643 Change-Id: I1723b7160924d82b0529b2346389cefebc4d7ef7 --- M scripts/redirect.py 1 file changed, 7 insertions(+), 12 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index ef04b64..1cf0da0 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -39,8 +39,6 @@ If neither of -xml -fullscan -moves is given, info will be loaded from a special page of the live wiki. --page:title Work on a single page - -offset:n With -moves, the number of hours ago to start scanning moved pages. With -xml, the number of the redirect to restart with (see progress). Otherwise, ignored. @@ -104,7 +102,6 @@ 'moves': False, 'namespaces': {0}, 'offset': -1, - 'page': None, 'start': None, 'limit': None, 'until': None, @@ -299,8 +296,6 @@ for (key, value) in redirs.items(): if value not in pageTitles: yield key - elif self.opt.page: - yield self.opt.page else: pywikibot.output('Retrieving broken redirect special page...') yield from self.site.preloadpages(self.site.broken_redirects()) @@ -330,8 +325,6 @@ pywikibot.output('\nChecking redirect {0} of {1}...' .format(num, total)) yield key - elif self.opt.page: - yield self.opt.page else: pywikibot.output('Retrieving double redirect special page...') yield from self.site.preloadpages(self.site.double_redirects()) @@ -693,7 +686,7 @@ source.add(arg) elif option == 'offset': gen_options[option] = int(value) - elif option in ('page', 'start', 'until'): + elif option in ('start', 'until'): gen_options[option] = value elif option == 'limit': options['limit'] = gen_options['limit'] = int(value) @@ -713,10 +706,12 @@ pywikibot.bot.suggest_help(missing_action=True) return - if gen_factory.namespaces: - gen_options['namespaces'] = gen_factory.namespaces - gen = RedirectGenerator(action, **gen_options) - options['generator'] = gen_factory.getCombinedGenerator(gen) + gen = None + if not gen_factory.gens: + if gen_factory.namespaces: + gen_options['namespaces'] = gen_factory.namespaces + gen = RedirectGenerator(action, **gen_options) + options['generator'] = gen_factory.getCombinedGenerator(gen=gen) bot = RedirectRobot(action, **options) bot.run() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/654468 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: I1723b7160924d82b0529b2346389cefebc4d7ef7 Gerrit-Change-Number: 654468 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: MarcoAurelio <maurelio(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2021