Pywikibot-commits December 2022

pywikibot-commits@lists.wikimedia.org

1 participants
60 discussions

[Gerrit] ...core[master]: Use re.fullmatch instead of $ at the end of regex

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871293 ) Change subject: Use re.fullmatch instead of $ at the end of regex ...................................................................... Use re.fullmatch instead of $ at the end of regex Change-Id: I4da10e242518c69d86416e4682de260be905f5d9 --- M pywikibot/tools/__init__.py M tests/uploadscript_tests.py M pywikibot/family.py M scripts/upload.py M pywikibot/time.py M pywikibot/site/_siteinfo.py M scripts/dataextend.py M scripts/reflinks.py 8 files changed, 49 insertions(+), 38 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/family.py b/pywikibot/family.py index 7f57190..981250b 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -6,7 +6,6 @@ # import collections import logging -import re import string import sys import types @@ -555,7 +554,7 @@ which would work with the given URL. """ parsed = urlparse.urlparse(url) - if not re.match('(https?)?$', parsed.scheme): + if parsed.scheme not in {'http', 'https', ''}: return None path = parsed.path diff --git a/pywikibot/site/_siteinfo.py b/pywikibot/site/_siteinfo.py index 3e3afac..4eb1293 100644 --- a/pywikibot/site/_siteinfo.py +++ b/pywikibot/site/_siteinfo.py @@ -29,7 +29,7 @@ """ WARNING_REGEX = re.compile(r'Unrecognized values? for parameter ' - r'["\']siprop["\']: (.+?)\.?$') + r'["\']siprop["\']: (.+?)\.?') # Until we get formatversion=2, we have to convert empty-string properties # into booleans so they are easier to use. @@ -139,7 +139,7 @@ """ def warn_handler(mod, message) -> bool: """Return True if the warning is handled.""" - matched = Siteinfo.WARNING_REGEX.match(message) + matched = Siteinfo.WARNING_REGEX.fullmatch(message) if mod == 'siteinfo' and matched: invalid_properties.extend( prop.strip() for prop in matched[1].split(',')) diff --git a/pywikibot/time.py b/pywikibot/time.py index e96a5f7..f760456 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -114,8 +114,8 @@ .. versionadded:: 7.5 """ - RE_MW = r'\d{14}$' # noqa: N806 - m = re.match(RE_MW, timestr) + RE_MW = r'\d{14}' # noqa: N806 + m = re.fullmatch(RE_MW, timestr) if not m: msg = "time data '{timestr}' does not match MW format." @@ -134,9 +134,9 @@ """ RE_ISO8601 = (r'(?:\d{4}-\d{2}-\d{2})(?P<sep>[T ])' # noqa: N806 r'(?:\d{2}:\d{2}:\d{2})(?P<u>[.,]\d{1,6})?' - r'(?P<tz>Z|[+\-]\d{2}:?\d{,2})?$' + r'(?P<tz>Z|[+\-]\d{2}:?\d{,2})?' ) - m = re.match(RE_ISO8601, timestr) + m = re.fullmatch(RE_ISO8601, timestr) if not m: msg = "time data '{timestr}' does not match ISO8601 format." @@ -174,8 +174,8 @@ .. versionadded:: 7.5 """ - RE_POSIX = r'(?P<S>-?\d{1,13})(?:\.(?P<u>\d{1,6}))?$' # noqa: N806 - m = re.match(RE_POSIX, timestr) + RE_POSIX = r'(?P<S>-?\d{1,13})(?:\.(?P<u>\d{1,6}))?' # noqa: N806 + m = re.fullmatch(RE_POSIX, timestr) if not m: msg = "time data '{timestr}' does not match POSIX format." diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 902653e..1c06290 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -438,7 +438,7 @@ """ MEDIAWIKI_VERSION = re.compile( - r'(\d+(?:\.\d+)+)(-?wmf\.?(\d+)|alpha|beta(\d+)|-?rc\.?(\d+)|.*)?$') + r'(\d+(?:\.\d+)+)(-?wmf\.?(\d+)|alpha|beta(\d+)|-?rc\.?(\d+)|.*)?') def __init__(self, version_str: str) -> None: """ @@ -449,7 +449,8 @@ self._parse(version_str) def _parse(self, version_str: str) -> None: - version_match = MediaWikiVersion.MEDIAWIKI_VERSION.match(version_str) + version_match = MediaWikiVersion.MEDIAWIKI_VERSION.fullmatch( + version_str) if not version_match: raise ValueError(f'Invalid version number "{version_str}"') diff --git a/scripts/dataextend.py b/scripts/dataextend.py index fbde614..7f326bc 100644 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -92,8 +92,8 @@ """The Bot.""" - QRE = re.compile(r'Q\d+$') - PQRE = re.compile(r'[PQ]\d+$') + QRE = re.compile(r'Q\d+') + PQRE = re.compile(r'[PQ]\d+') def __init__(self, **kwargs): """Initializer.""" @@ -358,7 +358,7 @@ return self.showtime(self.createdateclaim(title[6:])) if title.startswith('!q!'): return title[3:] - if not self.PQRE.match(title): + if not self.PQRE.fullmatch(title): return title if title in self.labels: @@ -593,33 +593,34 @@ year = int(m[1]) month = int(m[2]) day = int(m[3]) - if re.match(r'\d{,4}(?:年頃|\.)?$', text): - year = int(text) + m = re.fullmatch(r'(\d{1,4})(?:年頃|\.)?', text) + if m: + year = int(m[1]) month = None day = None - if re.match(r'(?:1\d{3}|20[01]\d)[01]\d[0123]\d$', text): + if re.fullmatch(r'(?:1\d{3}|20[01]\d)[01]\d[0123]\d', text): year = int(text[:4]) month = int(text[4:6]) day = int(text[6:]) - if re.match(r'\d{4}-\d{2}$', text): + if re.fullmatch(r'\d{4}-\d{2}', text): year = int(text[:4]) month = int(text[-2:]) m = re.match(r'(\d{1,2})[-/](\d{4})', text) if m: year = int(m[2]) month = int(m[1]) - m = re.match(r'(\d+)[-./|](\d{1,2})[-./|](\d{1,2})$', text) + m = re.fullmatch(r'(\d+)[-./|](\d{1,2})[-./|](\d{1,2})', text) if m: year = int(m[1]) month = int(m[2]) day = int(m[3]) - m = re.match( - r'(\d{1,2})[-./|]\s*(\d{1,2})[-./|]\s*(\d{3,4})\.?$', text) + m = re.fullmatch( + r'(\d{1,2})[-./|]\s*(\d{1,2})[-./|]\s*(\d{3,4})\.?', text) if m: year = int(m[3]) month = int(m[2]) day = int(m[1]) - m = re.match(r'(\d{1,2})[-./\s]([iIvVxX]+)[-./\s](\d{4})$', text) + m = re.fullmatch(r'(\d{1,2})[-./\s]([iIvVxX]+)[-./\s](\d{4})', text) if m: year = int(m[3]) try: @@ -627,8 +628,8 @@ except KeyError: raise ValueError(f"Don't know month {m[2]}") day = int(m[1]) - m = re.match(r"(\d+)(?:\.|er|eme|ème)?[\s.]\s*(?:d'|d[aei] )?" - r'([^\s.]{2,})\.?[\s.]\s*(\d+)$', text) + m = re.fullmatch(r"(\d+)(?:\.|er|eme|ème)?[\s.]\s*(?:d'|d[aei] )?" + r'([^\s.]{2,})\.?[\s.]\s*(\d+)', text) if m: year = int(m[3]) try: @@ -636,7 +637,8 @@ except KeyError: raise ValueError(f"Don't know month {m[2]}") day = int(m[1]) - m = re.match(r'(\d{4})\.?[\s.]\s*([^\s.]{3,})\.?[\s.]\s*(\d+)$', text) + m = re.fullmatch( + r'(\d{4})\.?[\s.]\s*([^\s.]{3,})\.?[\s.]\s*(\d+)', text) if m: year = int(m[1]) try: @@ -652,15 +654,15 @@ except KeyError: raise ValueError(f"Don't know month {m[2]}") day = int(m[1]) - m = re.match(r'(\w*[a-zA-Z]\w*)\.? (\d+)$', text) + m = re.fullmatch(r'(\w*[a-zA-Z]\w*)\.? (\d+)', text) if m: year = int(m[2]) try: month = self.MONTHNUMBER[m[1].lower()] except KeyError: raise ValueError(f"Don't know month {m[1]}") - m = re.match(r'(\w+)\.? (\d{1,2})(?:st|nd|rd|th)?\.?\s*,\s*(\d{3,4})$', - text) + m = re.fullmatch( + r'(\w+)\.? (\d{1,2})(?:st|nd|rd|th)?\.?\s*,\s*(\d{3,4})', text) if m: year = int(m[3]) try: @@ -681,7 +683,7 @@ year = int(m[1]) month = int(m[2]) day = int(m[3]) - m = re.match(r'(\d+)年$', text) + m = re.fullmatch(r'(\d+)年', text) if m: year = int(m[1]) if day == 0: @@ -868,7 +870,7 @@ createdclaim = pywikibot.Claim(self.site, claim[0]) - if self.QRE.match(claim[1]): + if self.QRE.fullmatch(claim[1]): createdclaim.setTarget(pywikibot.ItemPage( self.site, claim[1])) diff --git a/scripts/reflinks.py b/scripts/reflinks.py index eb673b2..2647f67 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -124,10 +124,10 @@ # matches an URL at the index of a website dirIndex = re.compile( r'\w+://[^/]+/((default|index)\.' - r'(asp|aspx|cgi|htm|html|phtml|mpx|mspx|php|shtml|var))?$', + r'(asp|aspx|cgi|htm|html|phtml|mpx|mspx|php|shtml|var))?', re.IGNORECASE) # Extracts the domain name -domain = re.compile(r'^(\w+)://(?:www.|)([^/]+)') +domain = re.compile(r'^(\w+)://(?:www\.|)([^/]+)') globalbadtitles = r""" # is @@ -601,8 +601,8 @@ f'Redirect 404 : {ref.link} ') continue - if dirIndex.match(redir) \ - and not dirIndex.match(ref.link): + if dirIndex.fullmatch(redir) \ + and not dirIndex.fullmatch(ref.link): pywikibot.info(f'<<lightyellow>>WARNING<<default>> : ' f'Redirect to root : {ref.link} ') continue diff --git a/scripts/upload.py b/scripts/upload.py index 1812b4a..fd1944b 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -67,7 +67,7 @@ CHUNK_SIZE_REGEX = re.compile( - r'-chunked(?::(\d+(?:\.\d+)?)[ \t]*(k|ki|m|mi)?b?)?$', re.I) + r'-chunked(?::(\d+(?:\.\d+)?)[ \t]*(k|ki|m|mi)?b?)?', re.I) def get_chunk_size(match) -> int: @@ -150,7 +150,7 @@ else: ignorewarn = True elif arg == '-chunked': - match = CHUNK_SIZE_REGEX.match(option) + match = CHUNK_SIZE_REGEX.fullmatch(option) chunk_size = get_chunk_size(match) elif arg == '-async': asynchronous = True diff --git a/tests/uploadscript_tests.py b/tests/uploadscript_tests.py index 89c7309..aa0441e 100755 --- a/tests/uploadscript_tests.py +++ b/tests/uploadscript_tests.py @@ -21,7 +21,7 @@ option = '-chunked' if value: option += ':' + value - match = CHUNK_SIZE_REGEX.match(option) + match = CHUNK_SIZE_REGEX.fullmatch(option) return get_chunk_size(match) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871293 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: I4da10e242518c69d86416e4682de260be905f5d9 Gerrit-Change-Number: 871293 Gerrit-PatchSet: 5 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

[Gerrit] ...core[master]: [textlib] replace addOnly parameter with add_only to be consistent

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868829 ) Change subject: [textlib] replace addOnly parameter with add_only to be consistent ...................................................................... [textlib] replace addOnly parameter with add_only to be consistent - replace addOnly parameter with add_only in replaceLanguageLinks and replaceCategoryLinks to be consistent with replaceCategoryInPlace and due to PEP8 - deprecate the old variant - update documentation - decrease nested flow statements in replaceCategoryLinks Change-Id: Ic9ed8b374f9a9b6af19621f824723f7184ed3804 --- M pywikibot/textlib.py 1 file changed, 68 insertions(+), 47 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 8b252a8..c7d1368 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -28,6 +28,7 @@ from pywikibot.tools import ( ModuleDeprecationWrapper, deprecated, + deprecated_args, first_lower, first_upper, ) @@ -904,7 +905,7 @@ # Adding the text text += '\n' + add # Reputting the categories - text = replaceCategoryLinks(text, categories_inside, site, addOnly=True) + text = replaceCategoryLinks(text, categories_inside, site, add_only=True) # Adding the interwiki return replaceLanguageLinks(text, interwiki_inside, site) @@ -1145,19 +1146,22 @@ return removeLanguageLinks(text, site, marker) -def replaceLanguageLinks(oldtext: str, new: dict, site=None, - addOnly: bool = False, template: bool = False, +@deprecated_args(addOnly='add_only') # since 8.0 +def replaceLanguageLinks(oldtext: str, + new: dict, + site: Optional['pywikibot.site.BaseSite'] = None, + add_only: bool = False, + template: bool = False, template_subpage: bool = False) -> str: """Replace inter-language links in the text with a new set of links. :param oldtext: The text that needs to be modified. - :param new: A dict with the Site objects as keys, and Page or Link objects - as values (i.e., just like the dict returned by getLanguageLinks - function). + :param new: A dict with the Site objects as keys, and Page or Link + objects as values (i.e., just like the dict returned by + :func:`getLanguageLinks` function). :param site: The site that the text is from. - :type site: pywikibot.Site - :param addOnly: If True, do not remove old language links, only add new - ones. + :param add_only: If True, do not remove old language links, only add + new ones. :param template: Indicates if text belongs to a template page or not. :param template_subpage: Indicates if text belongs to a template sub-page or not. @@ -1171,7 +1175,7 @@ cseparator = site.family.category_text_separator separatorstripped = separator.strip() cseparatorstripped = cseparator.strip() - if addOnly: + if add_only: s2 = oldtext else: s2 = removeLanguageLinksAndSeparator(oldtext, site=site, marker=marker, @@ -1203,7 +1207,7 @@ s2 = removeCategoryLinksAndSeparator( s2.replace(marker, cseparatorstripped).strip(), site) \ + separator + s - newtext = replaceCategoryLinks(s2, cats, site=site, addOnly=True) + newtext = replaceCategoryLinks(s2, cats, site=site, add_only=True) # for Wikitravel's language links position. # (not supported by rewrite - no API) elif site.family.name == 'wikitravel': @@ -1480,19 +1484,21 @@ return text -def replaceCategoryLinks(oldtext: str, new, site=None, - addOnly: bool = False) -> str: +@deprecated_args(addOnly='add_only') # since 8.0 +def replaceCategoryLinks(oldtext: str, + new: Iterable, + site: Optional['pywikibot.site.BaseSite'] = None, + add_only: bool = False) -> str: """ Replace all existing category links with new category links. :param oldtext: The text that needs to be replaced. :param new: Should be a list of Category objects or strings - which can be either the raw name or [[Category:..]]. - :type new: iterable + which can be either the raw name or ``[[Category:..]]``. :param site: The site that the text is from. - :type site: pywikibot.Site - :param addOnly: If addOnly is True, the old category won't be deleted and - the category(s) given will be added (and they won't replace anything). + :param add_only: If add_only is True, the old category won't be + deleted and the category(s) given will be added (and they won't + replace anything). :return: The modified text. """ # Find a marker that is not already in the text. @@ -1507,41 +1513,40 @@ iseparator = site.family.interwiki_text_separator separatorstripped = separator.strip() iseparatorstripped = iseparator.strip() - if addOnly: + if add_only: cats_removed_text = oldtext else: cats_removed_text = removeCategoryLinksAndSeparator( oldtext, site=site, marker=marker, separator=separatorstripped) new_cats = categoryFormat(new, insite=site) - if new_cats: - if site.code in site.family.category_attop: - newtext = new_cats + separator + cats_removed_text - else: - # calculate what was after the categories links on the page - firstafter = cats_removed_text.find(marker) - if firstafter < 0: - firstafter = len(cats_removed_text) - else: - firstafter += len(marker) - # Is there text in the 'after' part that means we should keep it - # after? - if '</noinclude>' in cats_removed_text[firstafter:]: - if separatorstripped: - new_cats = separator + new_cats - newtext = (cats_removed_text[:firstafter].replace(marker, '') - + new_cats + cats_removed_text[firstafter:]) - elif site.code in site.family.categories_last: - newtext = (cats_removed_text.replace(marker, '').strip() - + separator + new_cats) - else: - interwiki = getLanguageLinks(cats_removed_text, insite=site) - langs_removed_text = removeLanguageLinksAndSeparator( - cats_removed_text.replace(marker, ''), site, '', - iseparatorstripped) + separator + new_cats - newtext = replaceLanguageLinks( - langs_removed_text, interwiki, site, addOnly=True) - else: + if not new_cats: newtext = cats_removed_text.replace(marker, '') + elif site.code in site.family.category_attop: + newtext = new_cats + separator + cats_removed_text + else: + # calculate what was after the categories links on the page + firstafter = cats_removed_text.find(marker) + if firstafter < 0: + firstafter = len(cats_removed_text) + else: + firstafter += len(marker) + # Is there text in the 'after' part that means we should keep it + # after? + if '</noinclude>' in cats_removed_text[firstafter:]: + if separatorstripped: + new_cats = separator + new_cats + newtext = (cats_removed_text[:firstafter].replace(marker, '') + + new_cats + cats_removed_text[firstafter:]) + elif site.code in site.family.categories_last: + newtext = (cats_removed_text.replace(marker, '').strip() + + separator + new_cats) + else: + interwiki = getLanguageLinks(cats_removed_text, insite=site) + langs_removed_text = removeLanguageLinksAndSeparator( + cats_removed_text.replace(marker, ''), site, '', + iseparatorstripped) + separator + new_cats + newtext = replaceLanguageLinks( + langs_removed_text, interwiki, site, add_only=True) # special parts under categories under_categories = [] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868829 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: Ic9ed8b374f9a9b6af19621f824723f7184ed3804 Gerrit-Change-Number: 868829 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

[Gerrit] ...core[master]: [fix] Fix deprecation warning for NoRedirectPageBot class

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871288 ) Change subject: [fix] Fix deprecation warning for NoRedirectPageBot class ...................................................................... [fix] Fix deprecation warning for NoRedirectPageBot class Bug: T325912 Change-Id: I3eea941e6dccf4e89f4734ced804c892ec1eb12a --- M pywikibot/bot.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 3ccc9e9..95dee26 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -2110,7 +2110,7 @@ def __init__(self, *args, **kwargs): """Deprecate NoRedirectPageBot.""" - issue_deprecation_warning('RedirectPageBot', + issue_deprecation_warning('NoRedirectPageBot', "BaseBot attribute 'use_redirects = False'", since='7.2.0') super().__init__(*args, **kwargs) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871288 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: I3eea941e6dccf4e89f4734ced804c892ec1eb12a Gerrit-Change-Number: 871288 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

[Gerrit] ...core[master]: [cleanup] Remove interwiki_putfirst from wiktionary family

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868778 ) Change subject: [cleanup] Remove interwiki_putfirst from wiktionary family ...................................................................... [cleanup] Remove interwiki_putfirst from wiktionary family - remove interwiki_putfirst from wikitionary family - remove alphabetic and alphabetic_revised from Family class because this list is no longer used - remove fyinterwiki from from Family class because this list is not used - add a "known_codes" list to be reused with wikisource_family - remove sorting_order.py script - update documentation Bug: T325426 Change-Id: I2ac6f0133e9a5e6ac6d2d99827bc50d3d06a96ce --- M pywikibot/families/wikisource_family.py M pywikibot/family.py M scripts/README.rst M docs/scripts_ref/scripts.maintenance.rst M docs/scripts/maintenance.rst D scripts/maintenance/sorting_order.py M .codecov.yml M scripts/maintenance/__init__.py M pywikibot/families/wiktionary_family.py M tests/site_tests.py 10 files changed, 73 insertions(+), 225 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.codecov.yml b/.codecov.yml index 8823dfc..3995096 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -26,7 +26,6 @@ - scripts/dataextend.py - scripts/maintenance/colors.py - scripts/maintenance/make_i18n_dict.py - - scripts/maintenance/sorting_order.py - scripts/maintenance/wikimedia_sites.py - scripts/userscripts/ - tests/pwb/ diff --git a/docs/scripts/maintenance.rst b/docs/scripts/maintenance.rst index b42c812..bc26c71 100644 --- a/docs/scripts/maintenance.rst +++ b/docs/scripts/maintenance.rst @@ -16,13 +16,6 @@ :no-members: :noindex: -sorting\_order script -===================== - -.. automodule:: scripts.maintenance.sorting_order - :no-members: - :noindex: - wikimedia\_sites script ======================= diff --git a/docs/scripts_ref/scripts.maintenance.rst b/docs/scripts_ref/scripts.maintenance.rst index 4f2d4b6..ab32f10 100644 --- a/docs/scripts_ref/scripts.maintenance.rst +++ b/docs/scripts_ref/scripts.maintenance.rst @@ -25,11 +25,6 @@ .. automodule:: scripts.maintenance.make_i18n_dict -scripts.maintenance.sorting\_order ----------------------------------- - -.. automodule:: scripts.maintenance.sorting_order - scripts.maintenance.wikimedia\_sites ------------------------------------ diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 388e2a3..2e2fd04 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -68,7 +68,7 @@ @classproperty def code_aliases(cls): cls.code_aliases = super().code_aliases.copy() - aliases = cls.alphabetic + ['-', 'www'] + aliases = cls.known_codes + ['-', 'www'] for code in aliases: if (code not in cls.languages_by_size and code not in cls.closed_wikis diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 3ed5602..ea222e7 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -5,7 +5,6 @@ # Distributed under the terms of the MIT license. # from pywikibot import family -from pywikibot.tools import classproperty # The Wikimedia family that is known as Wiktionary @@ -68,49 +67,6 @@ 'vi', 'vo', 'wa', 'wo', 'yi', 'zh', 'zh-min-nan', 'zu', ] - # Which languages have a special order for putting interlanguage links, - # and what order is it? If a language is not in interwiki_putfirst, - # alphabetical order on language code is used. For languages that are in - # interwiki_putfirst, interwiki_putfirst is checked first, and - # languages are put in the order given there. All other languages are - # put after those, in code-alphabetical order. - - alphabetic_sv = [ - 'aa', 'af', 'ak', 'als', 'an', 'roa-rup', 'ast', 'gn', 'ay', 'az', - 'id', 'ms', 'bm', 'zh-min-nan', 'jv', 'su', 'mt', 'bi', 'bo', 'bs', - 'br', 'ca', 'cs', 'ch', 'sn', 'co', 'za', 'cy', 'da', 'de', 'na', 'mh', - 'et', 'ang', 'en', 'es', 'eo', 'eu', 'to', 'fr', 'fy', 'fo', 'ga', - 'gv', 'sm', 'gd', 'gl', 'hr', 'io', 'ia', 'ie', 'ik', 'xh', 'is', 'zu', - 'it', 'kl', 'csb', 'kw', 'rw', 'rn', 'sw', 'ky', 'ku', 'la', 'lv', - 'lb', 'lt', 'li', 'ln', 'jbo', 'hu', 'mg', 'mi', 'mo', 'my', 'fj', - 'nah', 'nl', 'cr', 'no', 'nn', 'hsb', 'oc', 'om', 'ug', 'uz', 'nds', - 'pl', 'pt', 'ro', 'rm', 'qu', 'sg', 'sc', 'st', 'tn', 'sq', 'scn', - 'simple', 'ss', 'sk', 'sl', 'so', 'sh', 'fi', 'sv', 'tl', 'tt', 'vi', - 'tpi', 'tr', 'tw', 'vo', 'wa', 'wo', 'ts', 'yo', 'el', 'av', 'ab', - 'ba', 'be', 'bg', 'mk', 'mn', 'ru', 'sr', 'tg', 'uk', 'kk', 'hy', 'yi', - 'he', 'ur', 'ar', 'tk', 'sd', 'fa', 'ha', 'ps', 'dv', 'ks', 'ne', 'pi', - 'bh', 'mr', 'sa', 'hi', 'as', 'bn', 'pa', 'pnb', 'gu', 'or', 'ta', - 'te', 'kn', 'ml', 'si', 'th', 'lo', 'dz', 'ka', 'ti', 'am', 'chr', - 'iu', 'km', 'zh', 'ja', 'ko', 'shn', - ] - - @classproperty - def interwiki_putfirst(cls): - cls.interwiki_putfirst = { - 'da': cls.alphabetic, - 'en': cls.alphabetic, - 'et': cls.alphabetic, - 'fi': cls.alphabetic, - 'fy': cls.fyinterwiki, - 'he': ['en'], - 'hu': ['en'], - 'ms': cls.alphabetic_revised, - 'pl': cls.alphabetic_revised, - 'sv': cls.alphabetic_sv, - 'simple': cls.alphabetic, - } - return cls.interwiki_putfirst - interwiki_on_one_line = ['pl'] interwiki_attop = ['pl'] diff --git a/pywikibot/family.py b/pywikibot/family.py index 87519ca..7f57190 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -41,7 +41,12 @@ class Family: - """Parent singleton class for all wiki families.""" + """Parent singleton class for all wiki families. + + .. versionchanged:: 8.0 + ``alphabetic``, ``alphabetic_revised`` and ``fyinterwiki`` + attributes where removed. + """ def __new__(cls): """Allocator.""" @@ -80,90 +85,6 @@ langs: Dict[str, str] = {} - # For interwiki sorting order see - # https://meta.wikimedia.org/wiki/Interwiki_sorting_order - - # The sorting order by language name from meta - # MediaWiki:Interwiki_config-sorting_order-native-languagename - alphabetic = [ - 'ace', 'kbd', 'ady', 'af', 'ak', 'als', 'alt', 'am', 'smn', 'ang', - 'ab', 'ar', 'an', 'arc', 'roa-rup', 'frp', 'as', 'ast', 'atj', 'awa', - 'gn', 'av', 'ay', 'az', 'ban', 'bm', 'bn', 'bjn', 'zh-min-nan', 'nan', - 'map-bms', 'ba', 'be', 'be-tarask', 'mnw', 'bh', 'bcl', 'bi', 'bg', - 'bar', 'blk', 'bo', 'bs', 'br', 'bxr', 'ca', 'cv', 'ceb', 'cs', 'ch', - 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'dag', 'da', 'dk', - 'ary', 'pdc', 'de', 'dv', 'nv', 'dsb', 'dty', 'dz', 'mh', 'et', 'el', - 'eml', 'en', 'myv', 'es', 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', - 'fr', 'fy', 'ff', 'fur', 'ga', 'gv', 'gag', 'gd', 'gl', 'gan', 'ki', - 'glk', 'guw', 'gu', 'gor', 'got', 'hak', 'xal', 'ko', 'ha', 'haw', - 'hy', 'hi', 'ho', 'hsb', 'hr', 'hyw', 'io', 'ig', 'ilo', 'inh', 'bpy', - 'id', 'ia', 'ie', 'iu', 'ik', 'os', 'xh', 'zu', 'is', 'it', 'he', 'jv', - 'kbp', 'kl', 'kn', 'kr', 'pam', 'krc', 'ka', 'ks', 'csb', 'kk', 'kw', - 'rw', 'rn', 'sw', 'kv', 'kg', 'gom', 'avk', 'ht', 'gcr', 'ku', 'kj', - 'ky', 'mrj', 'lld', 'lad', 'lbe', 'lo', 'ltg', 'la', 'lv', 'lb', 'lez', - 'lfn', 'lt', 'lij', 'li', 'ln', 'olo', 'jbo', 'lg', 'lmo', 'lrc', - 'mad', 'hu', 'mai', 'mk', 'mg', 'ml', 'mt', 'mi', 'mr', 'xmf', 'arz', - 'mzn', 'mni', 'ms', 'min', 'cdo', 'mwl', 'mdf', 'mo', 'mn', 'mus', - 'my', 'nah', 'na', 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'nia', - 'ja', 'nqo', 'nap', 'ce', 'frr', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', - 'ii', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pfl', - 'pag', 'ami', 'pnb', 'pap', 'ps', 'jam', 'koi', 'km', 'pcd', 'pcm', - 'pms', 'pwn', 'tpi', 'nds', 'pl', 'pnt', 'pt', 'aa', 'kaa', 'crh', - 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'rue', 'ru', 'sah', 'szy', 'se', - 'sm', 'sa', 'sg', 'sat', 'skr', 'sc', 'sco', 'trv', 'stq', 'st', 'nso', - 'tn', 'sq', 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'sl', 'cu', 'szl', - 'so', 'ckb', 'srn', 'sr', 'sh', 'su', 'fi', 'sv', 'shi', 'tl', 'shn', - 'ta', 'kab', 'roa-tara', 'tt', 'tay', 'te', 'tet', 'th', 'ti', 'tg', - 'to', 'chr', 'chy', 've', 'tcy', 'tr', 'azb', 'tk', 'tw', 'kcg', 'tyv', - 'din', 'udm', 'bug', 'uk', 'ur', 'ug', 'za', 'vec', 'vep', 'vi', 'vo', - 'fiu-vro', 'wa', 'zh-classical', 'vls', 'war', 'wo', 'wuu', 'ts', 'yi', - 'yo', 'zh-yue', 'diq', 'zea', 'bat-smg', 'zh', 'zh-tw', 'zh-cn', - ] - - # The revised sorting order by first word from meta - # MediaWiki:Interwiki_config-sorting_order-native-languagename-firstword - alphabetic_revised = [ - 'ace', 'ady', 'kbd', 'af', 'ak', 'als', 'alt', 'kcg', 'am', 'smn', - 'ang', 'ab', 'ar', 'an', 'arc', 'roa-rup', 'frp', 'as', 'ast', 'atj', - 'awa', 'gn', 'av', 'ay', 'az', 'bjn', 'id', 'ms', 'ban', 'bm', 'bn', - 'zh-min-nan', 'nan', 'map-bms', 'jv', 'su', 'ba', 'min', 'be', - 'be-tarask', 'mnw', 'mad', 'bh', 'bcl', 'bi', 'bar', 'blk', 'bo', 'bs', - 'br', 'bug', 'bg', 'bxr', 'ca', 'ceb', 'cv', 'cs', 'ch', 'cbk-zam', - 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'dag', 'da', 'dk', 'ary', 'pdc', - 'de', 'dv', 'nv', 'dsb', 'na', 'dty', 'dz', 'mh', 'et', 'el', 'eml', - 'en', 'myv', 'es', 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', - 'fy', 'ff', 'fur', 'ga', 'gv', 'sm', 'gag', 'gd', 'gl', 'gan', 'ki', - 'glk', 'guw', 'gu', 'got', 'hak', 'xal', 'ko', 'ha', 'haw', 'hy', 'hi', - 'ho', 'hsb', 'hr', 'hyw', 'io', 'ig', 'ilo', 'inh', 'bpy', 'ia', 'ie', - 'iu', 'ik', 'os', 'xh', 'zu', 'is', 'it', 'he', 'kl', 'kn', 'kr', - 'pam', 'ka', 'ks', 'csb', 'kk', 'kw', 'rw', 'ky', 'rn', 'mrj', 'sw', - 'kv', 'kg', 'gom', 'avk', 'gor', 'ht', 'gcr', 'ku', 'shn', 'kj', 'lld', - 'lad', 'lbe', 'lez', 'lfn', 'lo', 'la', 'ltg', 'lv', 'to', 'lb', 'lt', - 'lij', 'li', 'ln', 'nia', 'olo', 'jbo', 'lg', 'lmo', 'lrc', 'hu', - 'mai', 'mk', 'mg', 'ml', 'krc', 'mt', 'mi', 'mr', 'xmf', 'arz', 'mzn', - 'mni', 'cdo', 'mwl', 'koi', 'mdf', 'mo', 'mn', 'mus', 'my', 'nah', - 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'ja', 'nqo', 'nap', 'ce', - 'frr', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', 'mhr', 'or', - 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pfl', 'pag', 'ami', 'pnb', 'pap', - 'ps', 'jam', 'km', 'pcd', 'pcm', 'pms', 'pwn', 'nds', 'pl', 'pnt', - 'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', - 'rue', 'sah', 'szy', 'se', 'sa', 'sg', 'sat', 'skr', 'sc', 'sco', - 'trv', 'stq', 'st', 'nso', 'tn', 'sq', 'scn', 'si', 'simple', 'sd', - 'ss', 'sk', 'sl', 'cu', 'szl', 'so', 'ckb', 'srn', 'sr', 'sh', 'fi', - 'sv', 'shi', 'tl', 'ta', 'kab', 'kbp', 'roa-tara', 'tt', 'tay', 'te', - 'tet', 'th', 'vi', 'ti', 'tg', 'tpi', 'chr', 'chy', 've', 'tcy', 'tr', - 'azb', 'tk', 'tw', 'tyv', 'din', 'udm', 'uk', 'ur', 'ug', 'za', 'vec', - 'vep', 'vo', 'fiu-vro', 'wa', 'zh-classical', 'vls', 'war', 'wo', - 'wuu', 'ts', 'yi', 'yo', 'zh-yue', 'diq', 'zea', 'bat-smg', 'zh', - 'zh-tw', 'zh-cn', - ] - - # Order for fy: alphabetical by code, but y counts as i - fyinterwiki = alphabetic[:] - fyinterwiki.remove('nb') - fyinterwiki.sort(key=lambda x: - x.replace('y', 'i') + x.count('y') * '!') - # A list of category redirect template names in different languages category_redirect_templates = { '_default': [] @@ -884,7 +805,11 @@ class WikimediaFamily(Family): - """Class for all wikimedia families.""" + """Class for all wikimedia families. + + .. versionchanged:: 8.0 + :attr:`knows_codes` attribute was added. + """ multi_language_content_families = [ 'wikipedia', 'wiktionary', @@ -932,6 +857,42 @@ + other_content_families ) + # Known Wikimedia site codes + known_codes = [ + 'aa', 'ab', 'ace', 'ady', 'af', 'ak', 'als', 'alt', 'am', 'ami', 'an', + 'ang', 'ar', 'arc', 'ary', 'arz', 'as', 'ast', 'atj', 'av', 'avk', + 'awa', 'ay', 'az', 'azb', 'ba', 'ban', 'bar', 'bat-smg', 'bcl', 'be', + 'be-tarask', 'bg', 'bh', 'bi', 'bjn', 'blk', 'bm', 'bn', 'bo', 'bpy', + 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ce', 'ceb', 'ch', + 'cho', 'chr', 'chy', 'ckb', 'co', 'cr', 'crh', 'cs', 'csb', 'cu', 'cv', + 'cy', 'da', 'dag', 'de', 'din', 'diq', 'dk', 'dsb', 'dty', 'dv', 'dz', + 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 'fa', 'ff', + 'fi', 'fiu-vro', 'fj', 'fo', 'fr', 'frp', 'frr', 'fur', 'fy', 'ga', + 'gag', 'gan', 'gcr', 'gd', 'gl', 'glk', 'gn', 'gom', 'gor', 'got', + 'gu', 'guw', 'gv', 'ha', 'hak', 'haw', 'he', 'hi', 'hif', 'ho', 'hr', + 'hsb', 'ht', 'hu', 'hy', 'hyw', 'hz', 'ia', 'id', 'ie', 'ig', 'ii', + 'ik', 'ilo', 'inh', 'io', 'is', 'it', 'iu', 'ja', 'jam', 'jbo', 'jv', + 'ka', 'kaa', 'kab', 'kbd', 'kbp', 'kcg', 'kg', 'ki', 'kj', 'kk', 'kl', + 'km', 'kn', 'ko', 'koi', 'kr', 'krc', 'ks', 'ksh', 'ku', 'kv', 'kw', + 'ky', 'la', 'lad', 'lb', 'lbe', 'lez', 'lfn', 'lg', 'li', 'lij', 'lld', + 'lmo', 'ln', 'lo', 'lrc', 'lt', 'ltg', 'lv', 'mad', 'mai', 'map-bms', + 'mdf', 'mg', 'mh', 'mhr', 'mi', 'min', 'mk', 'ml', 'mn', 'mni', 'mnw', + 'mo', 'mr', 'mrj', 'ms', 'mt', 'mus', 'mwl', 'my', 'myv', 'mzn', 'na', + 'nah', 'nan', 'nap', 'nb', 'nds', 'nds-nl', 'ne', 'new', 'ng', 'nia', + 'nl', 'nn', 'no', 'nov', 'nqo', 'nrm', 'nso', 'nv', 'ny', 'oc', 'olo', + 'om', 'or', 'os', 'pa', 'pag', 'pam', 'pap', 'pcd', 'pcm', 'pdc', + 'pfl', 'pi', 'pih', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'pwn', 'qu', + 'rm', 'rmy', 'rn', 'ro', 'roa-rup', 'roa-tara', 'ru', 'rue', 'rw', + 'sa', 'sah', 'sat', 'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'shi', + 'shn', 'si', 'simple', 'sk', 'skr', 'sl', 'sm', 'smn', 'sn', 'so', + 'sq', 'sr', 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'szy', + 'ta', 'tay', 'tcy', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', + 'to', 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty', 'tyv', 'udm', + 'ug', 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls', 'vo', 'wa', + 'war', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea', 'zh', + 'zh-classical', 'zh-cn', 'zh-min-nan', 'zh-tw', 'zh-yue', 'zu', + ] + # Code mappings which are only an alias, and there is no 'old' wiki. # For all except 'nl_nds', subdomains do exist as a redirect, but that # should not be relied upon. diff --git a/scripts/README.rst b/scripts/README.rst index 62b413e..0d27749 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -165,8 +165,6 @@ +------------------------+---------------------------------------------------------+ | make_i18n_dict.py | Generate an i18n file from a given script. | +------------------------+---------------------------------------------------------+ -| sorting_order.py | Updates interwiki sorting order in family.py file. | -+------------------------+---------------------------------------------------------+ | wikimedia_sites.py | Updates the language lists in Wikimedia family files. | +------------------------+---------------------------------------------------------+ diff --git a/scripts/maintenance/__init__.py b/scripts/maintenance/__init__.py index 3fe2e25..e2ce651 100644 --- a/scripts/maintenance/__init__.py +++ b/scripts/maintenance/__init__.py @@ -1 +1,5 @@ -"""Maintenance scripts.""" +"""Maintenance scripts. + +.. versionchanged:: 8.0 + sorting_order script was removed. +""" diff --git a/scripts/maintenance/sorting_order.py b/scripts/maintenance/sorting_order.py deleted file mode 100755 index 5bfad98..0000000 --- a/scripts/maintenance/sorting_order.py +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/python3 -"""Script that updates interwiki sorting order in family.py file.""" -# -# (C) Pywikibot team, 2020-2022 -# -# Distributed under the terms of the MIT license. -# -import re -from pathlib import Path - -import pywikibot -from pywikibot.family import Family - - -# MediaWiki page names for interwiki sorting order -pages = { - 'alphabetic': - 'Interwiki config-sorting order-native-languagename', - 'alphabetic_revised': - 'Interwiki_config-sorting_order-native-languagename-firstword', -} - - -def update_family(list_name, page): - """Update family.py file.""" - pywikibot.info(f'\nReading {list_name} sorting order from\n' - f'{page.title(with_ns=False)!r}...') - - original = getattr(Family, list_name) - new = page.text.split() - - # put the missing languages to the right place - missing = original != new and set(original) - set(new) - if missing: - pywikibot.warning("['{}'] not listed at meta." - .format("', '".join(missing))) - index = {} - for code in missing: - index[original.index(code)] = code - i = len(index) - 1 - for key in index: - new.insert(key - i, index[key]) - i -= 1 - - if original == new: - pywikibot.info('The lists match!') - return - - pywikibot.info("The lists don't match, the new list is:") - text = f' {list_name} = [\n' - line = ' ' * 7 - for code in new: - if len(line) + len(code) >= 76: - text += line + '\n' - line = ' ' * 7 - line += f" '{code}'," - text += line + '\n' - text += ' ]' - pywikibot.info(text) - filepath = Path('pywikibot/family.py') - family_text = filepath.read_text(encoding='utf8') - family_text = re.sub(r'(?ms)^ {4}%s.+?\]' % list_name, - text, family_text, 1) - filepath.write_text(family_text, encoding='utf8') - - -def main(): - """Main entry function.""" - site = pywikibot.Site('meta') - for list_name, page_name in pages.items(): - page = pywikibot.Page(site, page_name, ns=site.namespaces.MEDIAWIKI) - update_family(list_name, page) - - -if __name__ == '__main__': - main() diff --git a/tests/site_tests.py b/tests/site_tests.py index aa503af..2dfd288 100755 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -123,8 +123,8 @@ self.assertIn(mysite.code, langs) self.assertIsInstance(mysite.obsolete, bool) ipf = mysite.interwiki_putfirst() - if ipf: # Not all languages use this - self.assertIsInstance(ipf, list) + if ipf: # no languages use this anymore, keep it for foreign families + self.assertIsInstance(ipf, list) # pragma: no cover else: self.assertIsNone(ipf) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868778 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: I2ac6f0133e9a5e6ac6d2d99827bc50d3d06a96ce Gerrit-Change-Number: 868778 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

[Gerrit] ...core[master]: [doc] Fix ROADMAP.rst and conf.py after merge of documentation changes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871265 ) Change subject: [doc] Fix ROADMAP.rst and conf.py after merge of documentation changes ...................................................................... [doc] Fix ROADMAP.rst and conf.py after merge of documentation changes Change-Id: Ic373ea45f85034e0b404556d2948985f09bb9eb3 --- M ROADMAP.rst M docs/conf.py 2 files changed, 10 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 609c6ff..a4958c6 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -79,9 +79,4 @@ * 6.2.0: Throttle.multiplydelay attribute is deprecated * 6.2.0: SequenceOutputter.format_list() is deprecated in favour of 'out' property * 6.0.0: config.register_family_file() is deprecated - - -Will be removed in Pywikibot 8 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - * 5.5.0: APISite.redirectRegex() will be removed in favour of APISite.redirect_regex() diff --git a/docs/conf.py b/docs/conf.py index 4a8b6eb..1a167d7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -200,12 +200,7 @@ # Custom sidebar templates, maps document names to template names. # -# html_sidebars = { -# '**': [ -# 'searchbox.html', 'localtoc.html', 'relations.html', -# 'sourcelink.html', -# ] -# } +# html_sidebars = {} # Additional templates that should be rendered to pages, maps page names to # template names. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871265 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: Ic373ea45f85034e0b404556d2948985f09bb9eb3 Gerrit-Change-Number: 871265 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

[Gerrit] ...core[master]: Merge branch 'tests' into T322212

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871264 ) Change subject: Merge branch 'tests' into T322212 ...................................................................... Merge branch 'tests' into T322212 Bug: T322212 Change-Id: I7e220a350679bf4ca816e5c37821426494bd4a5b --- M pywikibot/textlib.py M docs/make.bat M ROADMAP.rst M docs/mwapi.rst M docs/recipes.rst M docs/utilities/scripts.rst M docs/index.rst M docs/scripts_ref/scripts.maintenance.rst M docs/tests_ref/index.rst M docs/api_ref/index.rst M docs/utilities/scripts_ref.rst M docs/installation.rst M docs/scripts/index.rst M HISTORY.rst M docs/introduction.rst M docs/scripts_ref/index.rst M docs/scripts_ref/scripts.i18n.rst M docs/utilities/install.rst M docs/scripts_ref/scripts.rst M docs/faq.rst M docs/scripts_ref/scripts.userscripts.rst 22 files changed, 36 insertions(+), 167 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/HISTORY.rst b/HISTORY.rst index 88b1822..694c539 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,14 +1,11 @@ Release history =============== -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) 7.7.2 ----- *03 December 2022* * Fix :class:`textlib.TimeStripper` for ``vi`` site code (:phab:`T324310`) -======= ->>>>>>> BRANCH (77cbd3 Update git submodules) 7.7.1 ----- diff --git a/ROADMAP.rst b/ROADMAP.rst index d2f1e69..609c6ff 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -79,12 +79,9 @@ * 6.2.0: Throttle.multiplydelay attribute is deprecated * 6.2.0: SequenceOutputter.format_list() is deprecated in favour of 'out' property * 6.0.0: config.register_family_file() is deprecated -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -======= Will be removed in Pywikibot 8 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->>>>>>> BRANCH (77cbd3 Update git submodules) * 5.5.0: APISite.redirectRegex() will be removed in favour of APISite.redirect_regex() diff --git a/docs/api_ref/index.rst b/docs/api_ref/index.rst index ffd4a74..5db1b21 100644 --- a/docs/api_ref/index.rst +++ b/docs/api_ref/index.rst @@ -15,14 +15,9 @@ functions provided by :mod:`data.api`. This layer then uses :func:`comms.http.request` to do the actual HTTP request. -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Table of contents -================= -======= ***************** Table of contents ***************** ->>>>>>> BRANCH (77cbd3 Update git submodules) .. toctree:: :glob: diff --git a/docs/faq.rst b/docs/faq.rst index cd3aeef..c422292 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -1,11 +1,7 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Frequent asked questions -======================== -======= ************************** Frequently asked questions ************************** ->>>>>>> BRANCH (77cbd3 Update git submodules) + **How to speed up Pywikibot?** 1. The first time you are using Pywikibot for multiple Wikimedia sites you diff --git a/docs/index.rst b/docs/index.rst index 474216e..a7b1802 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -37,15 +37,9 @@ .. image:: framework.png :alt: Framework modules dependency network -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) - -Contents --------- -======= ******** Contents ******** ->>>>>>> BRANCH (77cbd3 Update git submodules) .. toctree:: :maxdepth: 1 diff --git a/docs/installation.rst b/docs/installation.rst index fcada23..bab9e27 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -1,9 +1,6 @@ :orphan: -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -======= ************ ->>>>>>> BRANCH (77cbd3 Update git submodules) Installation ************ diff --git a/docs/introduction.rst b/docs/introduction.rst index 1087d51..b5dc1fb 100644 --- a/docs/introduction.rst +++ b/docs/introduction.rst @@ -31,11 +31,7 @@ #. set the `userinterface_lang` in your :ref:`user-config.py<User Interface Settings>` to your preferred language #. set environment variable `PYWIKIBOT_USERINTERFACE_LANG` to your preferred language -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) #. default is obtained from `locale.getlocale` -======= -#. default is obtained from `locale.getdefaultlocale` ->>>>>>> BRANCH (77cbd3 Update git submodules) #. fallback is `'en'` for English if all other options fails .. note:: The preferred language code must follow ISO 639. diff --git a/docs/make.bat b/docs/make.bat index 123c497..6726495 100644 --- a/docs/make.bat +++ b/docs/make.bat @@ -10,11 +10,7 @@ set SOURCEDIR=. set BUILDDIR=_build set SPHINXPROJ=Pywikibot -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -set SPHINXOPTS=%~2 %~3 %~4 %~5 %~6 %~7 %~8 %~9 -======= set SPHINXOPTS=-j auto ->>>>>>> BRANCH (77cbd3 Update git submodules) if "%1" == "" goto help if "%1" == "help" goto help diff --git a/docs/mwapi.rst b/docs/mwapi.rst index b470052..7072057 100644 --- a/docs/mwapi.rst +++ b/docs/mwapi.rst @@ -3,18 +3,11 @@ <br /> -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -MediaWiki API cross reference -============================= -======= ***************************** MediaWiki API cross reference ***************************** See the table below for a cross reference between MediaWiki's API and Pywikibot's API. ->>>>>>> BRANCH (77cbd3 Update git submodules) - -See the table below for a cross reference between MediaWiki's API and Pywikibot's API. .. list-table:: :header-rows: 1 diff --git a/docs/recipes.rst b/docs/recipes.rst index 5cc46b3..bba2fdd 100644 --- a/docs/recipes.rst +++ b/docs/recipes.rst @@ -3,11 +3,7 @@ ******* How to modify a page -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) --------------------- -======= ==================== ->>>>>>> BRANCH (77cbd3 Update git submodules) >>> page = pywikibot.Page(pywikibot.Site(), 'Sample page') >>> new_content = page.text.replace('this', 'that') @@ -16,11 +12,7 @@ See :doc:`library_usage` for more advanced samples. How to get links from summary section of page -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ---------------------------------------------- -======= ============================================= ->>>>>>> BRANCH (77cbd3 Update git submodules) >>> import pywikibot >>> from pwikibot import textlib diff --git a/docs/scripts/index.rst b/docs/scripts/index.rst index a211f38..ba9751a 100644 --- a/docs/scripts/index.rst +++ b/docs/scripts/index.rst @@ -1,12 +1,6 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -=============== -Scripts package -=============== -======= ############### Scripts package ############### ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: scripts :no-members: @@ -16,14 +10,9 @@ :start-after: included. :end-before: More precise -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Script descriptions -=================== -======= ******************* Script descriptions ******************* ->>>>>>> BRANCH (77cbd3 Update git submodules) .. toctree:: :maxdepth: 1 diff --git a/docs/scripts_ref/index.rst b/docs/scripts_ref/index.rst index b28776e..0a582b3 100644 --- a/docs/scripts_ref/index.rst +++ b/docs/scripts_ref/index.rst @@ -1,11 +1,6 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Scripts reference ------------------ -======= ################# Scripts reference ################# ->>>>>>> BRANCH (77cbd3 Update git submodules) Pywikibot framework has a lot of ready-to-use scripts for several tasks. In general the usage and options of all scripts may be shown by using the command diff --git a/docs/scripts_ref/scripts.i18n.rst b/docs/scripts_ref/scripts.i18n.rst index 83785ad..725eb11 100644 --- a/docs/scripts_ref/scripts.i18n.rst +++ b/docs/scripts_ref/scripts.i18n.rst @@ -1,10 +1,5 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Translation files - scripts.i18n -================================ -======= ******************************** Translation files - scripts.i18n ******************************** ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: scripts.i18n diff --git a/docs/scripts_ref/scripts.maintenance.rst b/docs/scripts_ref/scripts.maintenance.rst index ec5a808..4f2d4b6 100644 --- a/docs/scripts_ref/scripts.maintenance.rst +++ b/docs/scripts_ref/scripts.maintenance.rst @@ -1,65 +1,36 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Maintenance scripts -=================== -======= ******************* Maintenance scripts ******************* ->>>>>>> BRANCH (77cbd3 Update git submodules) This page contains documentation of the `scripts.maintenance` module: .. automodule:: scripts.maintenance Maintenance submodules -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ----------------------- -======= ====================== ->>>>>>> BRANCH (77cbd3 Update git submodules) scripts.maintenance.cache -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) --------------------------------- -======= ------------------------- ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: scripts.maintenance.cache :ignore-module-all: scripts.maintenance.colors -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ---------------------------------- -======= -------------------------- ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: scripts.maintenance.colors scripts.maintenance.make\_i18n\_dict -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -------------------------------------------- -======= ------------------------------------ ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: scripts.maintenance.make_i18n_dict scripts.maintenance.sorting\_order -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ------------------------------------------ -======= ---------------------------------- ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: scripts.maintenance.sorting_order scripts.maintenance.wikimedia\_sites -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -------------------------------------------- -======= ------------------------------------ ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: scripts.maintenance.wikimedia_sites diff --git a/docs/scripts_ref/scripts.rst b/docs/scripts_ref/scripts.rst index b1704b8..4009f52 100644 --- a/docs/scripts_ref/scripts.rst +++ b/docs/scripts_ref/scripts.rst @@ -1,11 +1,6 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Scripts package -=============== -======= *************** Scripts package *************** ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: scripts @@ -280,11 +275,7 @@ .. automodule:: scripts.welcome Script subpackages -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ------------------- -======= ================== ->>>>>>> BRANCH (77cbd3 Update git submodules) For information on contents of subpackages, see diff --git a/docs/scripts_ref/scripts.userscripts.rst b/docs/scripts_ref/scripts.userscripts.rst index 00b03c0..471e6df 100644 --- a/docs/scripts_ref/scripts.userscripts.rst +++ b/docs/scripts_ref/scripts.userscripts.rst @@ -1,10 +1,5 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -User scripts - scripts.userscripts -================================== -======= ********************************** User scripts - scripts.userscripts ********************************** ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: scripts.userscripts diff --git a/docs/tests_ref/index.rst b/docs/tests_ref/index.rst index 684548f..b957ade 100644 --- a/docs/tests_ref/index.rst +++ b/docs/tests_ref/index.rst @@ -1,12 +1,6 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -=============== -Tests reference -=============== -======= ############### Tests reference ############### ->>>>>>> BRANCH (77cbd3 Update git submodules) .. include:: ../../tests/README.rst diff --git a/docs/utilities/install.rst b/docs/utilities/install.rst index 2e64037..ba13e72 100644 --- a/docs/utilities/install.rst +++ b/docs/utilities/install.rst @@ -1,11 +1,6 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Installer scripts -================= -======= ***************** Installer scripts ***************** ->>>>>>> BRANCH (77cbd3 Update git submodules) make\_dist script ================= diff --git a/docs/utilities/scripts.rst b/docs/utilities/scripts.rst index 4b9112a..474bca9 100644 --- a/docs/utilities/scripts.rst +++ b/docs/utilities/scripts.rst @@ -1,88 +1,55 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Framework utility scripts -===================================== -======= ************************* Framework utility scripts ************************* ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: pywikibot.scripts :no-members: :noindex: pwb wrapper script -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ------------------------------- -======= ================== ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: pywikibot.scripts.wrapper :no-members: :noindex: generate\_family\_file script -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ------------------------------------------ -======= ============================= ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: pywikibot.scripts.generate_family_file :no-members: :noindex: generate\_user\_files script -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ----------------------------------------- -======= ============================ ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: pywikibot.scripts.generate_user_files :no-members: :noindex: login script -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ------------------------- -======= ============ ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: pywikibot.scripts.login :no-members: :noindex: preload_sites script -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) --------------------------------- -======= ==================== ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: pywikibot.scripts.preload_sites :no-members: :noindex: shell script -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) ------------------------- -======= ============ ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: pywikibot.scripts.shell :no-members: :noindex: version script -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) --------------------------- -======= ============== ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: pywikibot.scripts.version :no-members: diff --git a/docs/utilities/scripts_ref.rst b/docs/utilities/scripts_ref.rst index 06418cf..d5acf52 100644 --- a/docs/utilities/scripts_ref.rst +++ b/docs/utilities/scripts_ref.rst @@ -1,11 +1,6 @@ -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -Framework utility scripts reference -=================================== -======= *********************************** Framework utility scripts reference *********************************** ->>>>>>> BRANCH (77cbd3 Update git submodules) .. automodule:: pywikibot.scripts :synopsis: Folder which holds framework scripts diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index fbd05da..9543fc8 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1876,12 +1876,6 @@ # site.months_names do not. if short.endswith('.'): self.origNames2monthNum[func(short[:-1])] = n -<<<<<<< HEAD (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result) -======= - - self.groups = ['year', 'month', 'hour', 'time', 'day', 'minute', - 'tzinfo'] ->>>>>>> BRANCH (77cbd3 Update git submodules) timeR = (r'(?P<time>(?P<hour>([0-1]\d|2[0-3]))[:\.h]' r'(?P<minute>[0-5]\d))') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871264 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: I7e220a350679bf4ca816e5c37821426494bd4a5b Gerrit-Change-Number: 871264 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

[Gerrit] ...core[master]: [bugfix] Add Timestamp.__repr__() method to unify the result

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871263 ) Change subject: [bugfix] Add Timestamp.__repr__() method to unify the result ...................................................................... [bugfix] Add Timestamp.__repr__() method to unify the result Unify representation for Timestamp object which is different between CPython and Pypy Bug: T325905 Change-Id: I9b471d120956cb9adac1ecf179bfe0712d5d67e6 --- M pywikibot/time.py 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/time.py b/pywikibot/time.py index 63bca0d..e96a5f7 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -293,6 +293,11 @@ """ return f'{self.posix_timestamp():.6f}' + def __repr__(self) -> str: + """Unify repr string between CPython and Pypy (T325905).""" + s = super().__repr__() + return f'{type(self).__name__}{s[s.find("("):]}' + def __str__(self) -> str: """Return a string format recognized by the API.""" return self.isoformat() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871263 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: I9b471d120956cb9adac1ecf179bfe0712d5d67e6 Gerrit-Change-Number: 871263 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

[Gerrit] ...core[master]: Make some string operations robust and verbose

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871237 ) Change subject: Make some string operations robust and verbose ...................................................................... Make some string operations robust and verbose Use removeprefix/removesuffix where they correspond to the intent. Change-Id: Ia1323e0f02c30ae3b55874cb41029346ef925639 --- M pywikibot/__init__.py M pywikibot/data/sparql.py M pywikibot/family.py M tests/family_tests.py M scripts/category_redirect.py M tests/gui_tests.py M pywikibot/pagegenerators/_factory.py M pywikibot/scripts/preload_sites.py M pywikibot/i18n.py M pywikibot/site_detect.py M scripts/claimit.py M pywikibot/data/api/_paraminfo.py M pywikibot/config.py M tests/__init__.py 14 files changed, 45 insertions(+), 24 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 9202523..f49d581 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -691,7 +691,7 @@ # also allow entity URIs to be provided via unit parameter if isinstance(unit, str) \ - and unit.partition('://')[0] not in ('http', 'https'): + and not unit.startswith(('http://', 'https://')): raise ValueError("'unit' must be an ItemPage or entity uri.") if error is None and not self._require_errors(site): diff --git a/pywikibot/config.py b/pywikibot/config.py index 1746a02..66248b3 100644 --- a/pywikibot/config.py +++ b/pywikibot/config.py @@ -62,6 +62,7 @@ List, Mapping, Tuple, + removeprefix, removesuffix, ) from pywikibot.logging import error, output, warning @@ -338,7 +339,7 @@ base_dir = '' for arg in sys.argv[1:]: if arg.startswith('-dir:'): - base_dir = arg[5:] + base_dir = removeprefix(arg, '-dir:') base_dir = os.path.expanduser(base_dir) break else: diff --git a/pywikibot/data/api/_paraminfo.py b/pywikibot/data/api/_paraminfo.py index 87422f4..f3accae 100644 --- a/pywikibot/data/api/_paraminfo.py +++ b/pywikibot/data/api/_paraminfo.py @@ -243,7 +243,8 @@ params['modules'] = [mod for mod in module_batch if not mod.startswith('query+') and mod not in self.root_modules] - params['querymodules'] = [mod[6:] for mod in module_batch + params['querymodules'] = [removeprefix(mod, 'query+') + for mod in module_batch if mod.startswith('query+')] for mod in set(module_batch) & self.root_modules: diff --git a/pywikibot/data/sparql.py b/pywikibot/data/sparql.py index 0f0dcc0..1b3fcc4 100644 --- a/pywikibot/data/sparql.py +++ b/pywikibot/data/sparql.py @@ -11,7 +11,7 @@ from requests.exceptions import Timeout from pywikibot import Site, config, sleep, warning -from pywikibot.backports import Dict, List +from pywikibot.backports import Dict, List, removeprefix from pywikibot.comms import http from pywikibot.exceptions import Error, TimeoutError @@ -227,9 +227,8 @@ :return: ID of Wikibase object, e.g. Q1234 """ - urllen = len(self.entity_url) if self.value.startswith(self.entity_url): - return self.value[urllen:] + return removeprefix(self.value, self.entity_url) return None def __repr__(self) -> str: diff --git a/pywikibot/family.py b/pywikibot/family.py index dff749a..87519ca 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -19,7 +19,13 @@ import pywikibot from pywikibot import config -from pywikibot.backports import Dict, List, Set, Tuple # skipcq: PY-W2000 +from pywikibot.backports import ( # skipcq: PY-W2000 + Dict, + List, + Set, + Tuple, + removesuffix, +) from pywikibot.exceptions import FamilyMaintenanceWarning, UnknownFamilyError from pywikibot.tools import classproperty, deprecated, remove_last_args @@ -1035,7 +1041,7 @@ def scriptpath(self, code): """Extract the script path from the URL.""" if self.url.path.endswith('/api.php'): - return self.url.path[0:-8] + return removesuffix(self.url.path, '/api.php') # AutoFamily refers to the variable set below, not the function # but the reference must be given here diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 9a19dac..a18fa8a 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -41,6 +41,7 @@ Match, Sequence, cache, + removesuffix, ) from pywikibot.plural import plural_rule @@ -810,7 +811,7 @@ pathname = os.path.join(next(iter(mod.__path__)), package) # build a list of languages in that directory - langs = [filename.partition('.')[0] + langs = [removesuffix(filename, '.json') for filename in sorted(os.listdir(pathname)) if filename.endswith('.json')] diff --git a/pywikibot/pagegenerators/_factory.py b/pywikibot/pagegenerators/_factory.py index f32c8e3..d965d26 100644 --- a/pywikibot/pagegenerators/_factory.py +++ b/pywikibot/pagegenerators/_factory.py @@ -23,6 +23,7 @@ List, Sequence, Tuple, + removeprefix, ) from pywikibot.bot import ShowingListOption from pywikibot.data import api @@ -622,7 +623,7 @@ value = pywikibot.input('What namespace are you filtering on?') not_key = 'not:' if value.startswith(not_key): - value = value[len(not_key):] + value = removeprefix(value, not_key) resolve = self.site.namespaces.resolve not_ns = set(resolve(value.split(','))) if not self._namespaces: diff --git a/pywikibot/scripts/preload_sites.py b/pywikibot/scripts/preload_sites.py index 6273279..533f739 100755 --- a/pywikibot/scripts/preload_sites.py +++ b/pywikibot/scripts/preload_sites.py @@ -28,7 +28,7 @@ from typing import Optional, Union import pywikibot -from pywikibot.backports import List, Set +from pywikibot.backports import List, Set, removeprefix from pywikibot.family import Family @@ -100,6 +100,6 @@ for arg in pywikibot.handle_args(): if arg in families_list: fam.add(arg) - elif arg.startswith('-worker'): - worker = int(arg.partition(':')[2]) + elif arg.startswith('-worker:'): + worker = int(removeprefix(arg, '-worker:')) preload_families(fam or families_list, worker) diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py index b4b2f6b..45f269d 100644 --- a/pywikibot/site_detect.py +++ b/pywikibot/site_detect.py @@ -16,6 +16,7 @@ import pywikibot from pywikibot.comms.http import fetch +from pywikibot.backports import removesuffix from pywikibot.exceptions import ServerError from pywikibot.tools import MediaWikiVersion @@ -45,8 +46,7 @@ :raises Timeout: a timeout occurred while loading the site :raises RuntimeError: Version not found or version less than 1.27 """ - if fromurl.endswith('$1'): - fromurl = fromurl[:-2] + fromurl = removesuffix(fromurl, '$1') r = fetch(fromurl, **kwargs) check_response(r) diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index fd90c6f..532116a 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -42,7 +42,7 @@ import pywikibot from pywikibot import config, i18n, pagegenerators -from pywikibot.backports import Tuple +from pywikibot.backports import Tuple, removeprefix from pywikibot.bot import ConfigParserBot, SingleSiteBot from pywikibot.exceptions import CircularRedirectError, Error, NoPageError @@ -495,8 +495,7 @@ options = {} for arg in pywikibot.handle_args(args): if arg.startswith('-delay:'): - pos = arg.find(':') - options[arg[1:pos]] = int(arg[pos + 1:]) + options['delay'] = int(removeprefix(arg, '-delay:')) else: # generic handling of we have boolean options options[arg[1:]] = True diff --git a/scripts/claimit.py b/scripts/claimit.py index cfffe99..ac4f9e6 100755 --- a/scripts/claimit.py +++ b/scripts/claimit.py @@ -52,6 +52,7 @@ # import pywikibot from pywikibot import WikidataBot, pagegenerators +from pywikibot.backports import removeprefix from pywikibot.tools.itertools import itergroup @@ -114,7 +115,7 @@ for arg in local_args: # Handle args specifying how to handle duplicate claims if arg.startswith('-exists:'): - exists_arg = arg.split(':')[1] + exists_arg = removeprefix(arg, '-exists:') continue # Handle page generator args if gen.handle_arg(arg): diff --git a/tests/__init__.py b/tests/__init__.py index c4b9b3c..a06d063 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -27,7 +27,7 @@ import pywikibot.data.api from pywikibot import config -from pywikibot.backports import Dict, List +from pywikibot.backports import Dict, List, removesuffix from pywikibot.data.api import CachedRequest from pywikibot.data.api import Request as _original_Request from pywikibot.tools import PYTHON_VERSION @@ -176,7 +176,7 @@ def _unknown_test_modules(): """List tests which are to be executed.""" dir_list = os.listdir(join_tests_path()) - all_test_set = {name[0:-9] for name in dir_list # strip '_tests.py' + all_test_set = {removesuffix(name, '_tests.py') for name in dir_list if name.endswith('_tests.py') and not name.startswith('_')} # skip __init__.py and _* diff --git a/tests/family_tests.py b/tests/family_tests.py index b8b1f33..a1d649c 100755 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -36,7 +36,7 @@ self.assertTrue(iter(f.domains)) for domain in f.domains: self.assertIsInstance(domain, str) - if domain.split(':', 1)[0] != 'localhost': + if not domain.startswith('localhost:'): self.assertIn('.', domain) self.assertEqual(f.name, name) diff --git a/tests/gui_tests.py b/tests/gui_tests.py index 5439738..a908542 100755 --- a/tests/gui_tests.py +++ b/tests/gui_tests.py @@ -22,8 +22,8 @@ def test_tk_dialog(self): """Test Tk dialog.""" desc = 'foo' - image = 'tests/data/images/MP_sounds.png' - filename = image.rsplit('/', 1)[1] + filename = 'MP_sounds.png' + image = f'tests/data/images/{filename}' box = Tkdialog(desc, image, filename) # skip after ~100 ms box.root.after(100, box.skip_file) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871237 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: Ia1323e0f02c30ae3b55874cb41029346ef925639 Gerrit-Change-Number: 871237 Gerrit-PatchSet: 3 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

[Gerrit] ...core[master]: [Bugfix] Return NotImplemented when other is not WbTime

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871007 ) Change subject: [Bugfix] Return NotImplemented when other is not WbTime ...................................................................... [Bugfix] Return NotImplemented when other is not WbTime Bug: T325863 Change-Id: I6e40e07a22371b5d5c85bbb62e8ce3a39fe73b90 --- M pywikibot/__init__.py M tests/wikibase_tests.py 2 files changed, 38 insertions(+), 8 deletions(-) Approvals: JJMC89: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 9202523..bb91042 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -477,21 +477,29 @@ elapsed_seconds += self.timezone * 60 return elapsed_seconds - def __lt__(self, other): + def __lt__(self, other: object) -> bool: """Compare if self is less than other.""" - return self._getSecondsAdjusted() < other._getSecondsAdjusted() + if isinstance(other, WbTime): + return self._getSecondsAdjusted() < other._getSecondsAdjusted() + return NotImplemented - def __le__(self, other): + def __le__(self, other: object) -> bool: """Compare if self is less equals other.""" - return self._getSecondsAdjusted() <= other._getSecondsAdjusted() + if isinstance(other, WbTime): + return self._getSecondsAdjusted() <= other._getSecondsAdjusted() + return NotImplemented - def __gt__(self, other): + def __gt__(self, other: object) -> bool: """Compare if self is greater than other.""" - return self._getSecondsAdjusted() > other._getSecondsAdjusted() + if isinstance(other, WbTime): + return self._getSecondsAdjusted() > other._getSecondsAdjusted() + return NotImplemented - def __ge__(self, other): + def __ge__(self, other: object) -> bool: """Compare if self is greater equals other.""" - return self._getSecondsAdjusted() >= other._getSecondsAdjusted() + if isinstance(other, WbTime): + return self._getSecondsAdjusted() >= other._getSecondsAdjusted() + return NotImplemented @classmethod def fromTimestr(cls: Type['WbTime'], diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 3867219..636aa02 100755 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -7,6 +7,7 @@ # import copy import json +import operator import unittest from contextlib import suppress from decimal import Decimal @@ -409,6 +410,17 @@ self.assertIsInstance(t1.toTimestamp(), pywikibot.Timestamp) self.assertRaises(ValueError, t2.toTimestamp) + def test_comparison_types(self): + """Test WbTime comparison with different types.""" + repo = self.get_repo() + t1 = pywikibot.WbTime(site=repo, year=2010, hour=12, minute=43) + t2 = pywikibot.WbTime(site=repo, year=-2005, hour=16, minute=45) + self.assertGreater(t1, t2) + self.assertRaises(TypeError, operator.lt, t1, 5) + self.assertRaises(TypeError, operator.gt, t1, 5) + self.assertRaises(TypeError, operator.le, t1, 5) + self.assertRaises(TypeError, operator.ge, t1, 5) + class TestWbQuantity(WbRepresentationTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871007 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: I6e40e07a22371b5d5c85bbb62e8ce3a39fe73b90 Gerrit-Change-Number: 871007 Gerrit-PatchSet: 4 Gerrit-Owner: RPI2026F1 <sarkaraoyan+rpi2026f1(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

[Gerrit] ...core[master]: [Bugfix] Implement comparison for WbTime object

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863328 ) Change subject: [Bugfix] Implement comparison for WbTime object ...................................................................... [Bugfix] Implement comparison for WbTime object - I used changeset 316220 as a basis for the tests - For the sake of simplicity, all of the other changes in the changeset were omitted - This implementation does not change any current attributes - This implementation factors in the correct number of days in a month - This implementation factors in leap years and the calendar model when calculating leap years - Note the difference in behavior of __ge__/__le__ and __eq__/__ne__ Bug: T148280 Change-Id: I694886fd4b264e97c351a8b2a5aefd2b5878be69 --- M pywikibot/__init__.py M tests/wikibase_tests.py 2 files changed, 127 insertions(+), 1 deletion(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve RPI2026F1: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index db7bdfe..9202523 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -319,6 +319,21 @@ _items = ('year', 'month', 'day', 'hour', 'minute', 'second', 'precision', 'before', 'after', 'timezone', 'calendarmodel') + _month_offset = { + 1: 0, + 2: 31, # Jan -> Feb: 31 days + 3: 59, # Feb -> Mar: 28 days, plus 31 days in Jan -> Feb + 4: 90, # Mar -> Apr: 31 days, plus 59 days in Jan -> Mar + 5: 120, # Apr -> May: 30 days, plus 90 days in Jan -> Apr + 6: 151, # May -> Jun: 31 days, plus 120 days in Jan -> May + 7: 181, # Jun -> Jul: 30 days, plus 151 days in Jan -> Jun + 8: 212, # Jul -> Aug: 31 days, plus 181 days in Jan -> Jul + 9: 243, # Aug -> Sep: 31 days, plus 212 days in Jan -> Aug + 10: 273, # Sep -> Oct: 30 days, plus 243 days in Jan -> Sep + 11: 304, # Oct -> Nov: 31 days, plus 273 days in Jan -> Oct + 12: 334, # Nov -> Dec: 30 days, plus 304 days in Jan -> Nov + } + def __init__(self, year: Optional[int] = None, month: Optional[int] = None, @@ -349,6 +364,12 @@ of the event, in the range −180° to 180°, multiplied by 4 to convert to minutes. + Comparison information: When using the greater than or equal to + operator, or the less than or equal to operator, two different time + objects with the same UTC time after factoring in timezones are + considered equal. However, the equality operator will return false + if the timezone is different. + :param year: The year as a signed integer of between 1 and 16 digits. :param month: Month of the timestamp, if it exists. :param day: Day of the timestamp, if it exists. @@ -406,7 +427,6 @@ .format(Site())) calendarmodel = site.calendarmodel() self.calendarmodel = calendarmodel - # if precision is given it overwrites the autodetection above if precision is not None: if (isinstance(precision, int) @@ -418,6 +438,61 @@ else: raise ValueError(f'Invalid precision: "{precision}"') + def _getSecondsAdjusted(self) -> int: + """Return an internal representation of the time object as seconds. + + The value adjusts itself for timezones. It is not compatible with + before/after. + + This value should *only* be used for comparisons, and + its value may change without warning. + + :return: An integer roughly representing the number of seconds + since January 1, 0000 AD, adjusted for leap years. + """ + # This function ignores leap seconds. Since it is not required + # to correlate to an actual UNIX timestamp, this is acceptable. + + # We are always required to have a year. + elapsed_seconds = int(self.year * 365.25 * 24 * 60 * 60) + if self.month > 1: + elapsed_seconds += self._month_offset[self.month] * 24 * 60 * 60 + # The greogrian calendar + if self.calendarmodel == 'http://www.wikidata.org/entity/Q1985727': + if (self.year % 400 == 0 + or (self.year % 4 == 0 and self.year % 100 != 0) + and self.month > 2): + elapsed_seconds += 24 * 60 * 60 # Leap year + # The julian calendar + if self.calendarmodel == 'http://www.wikidata.org/entity/Q1985786': + if self.year % 4 == 0 and self.month > 2: + elapsed_seconds += 24 * 60 * 60 + if self.day > 1: + # Days start at 1, not 0. + elapsed_seconds += (self.day - 1) * 24 * 60 * 60 + elapsed_seconds += self.hour * 60 * 60 + elapsed_seconds += self.minute * 60 + elapsed_seconds += self.second + if self.timezone is not None: + elapsed_seconds += self.timezone * 60 + return elapsed_seconds + + def __lt__(self, other): + """Compare if self is less than other.""" + return self._getSecondsAdjusted() < other._getSecondsAdjusted() + + def __le__(self, other): + """Compare if self is less equals other.""" + return self._getSecondsAdjusted() <= other._getSecondsAdjusted() + + def __gt__(self, other): + """Compare if self is greater than other.""" + return self._getSecondsAdjusted() > other._getSecondsAdjusted() + + def __ge__(self, other): + """Compare if self is greater equals other.""" + return self._getSecondsAdjusted() >= other._getSecondsAdjusted() + @classmethod def fromTimestr(cls: Type['WbTime'], datetimestr: str, diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index c97f6f7..3867219 100755 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -378,6 +378,37 @@ with self.assertRaisesRegex(ValueError, regex): pywikibot.WbTime(site=repo, precision='invalid_precision') + def test_comparison(self): + """Test WbTime comparison.""" + repo = self.get_repo() + t1 = pywikibot.WbTime(site=repo, year=2010, hour=12, minute=43) + t2 = pywikibot.WbTime(site=repo, year=-2005, hour=16, minute=45) + self.assertEqual(t1.precision, pywikibot.WbTime.PRECISION['minute']) + self.assertEqual(t1, t1) + self.assertGreaterEqual(t1, t1) + self.assertGreaterEqual(t1, t2) + self.assertGreater(t1, t2) + self.assertEqual(t1.year, 2010) + self.assertEqual(t2.year, -2005) + self.assertEqual(t1.month, 1) + self.assertEqual(t2.month, 1) + self.assertEqual(t1.day, 1) + self.assertEqual(t2.day, 1) + self.assertEqual(t1.hour, 12) + self.assertEqual(t2.hour, 16) + self.assertEqual(t1.minute, 43) + self.assertEqual(t2.minute, 45) + self.assertEqual(t1.second, 0) + self.assertEqual(t2.second, 0) + self.assertEqual(t1.toTimestr(), '+00000002010-01-01T12:43:00Z') + self.assertEqual(t2.toTimestr(), '-00000002005-01-01T16:45:00Z') + self.assertRaises(ValueError, pywikibot.WbTime, site=repo, + precision=15) + self.assertRaises(ValueError, pywikibot.WbTime, site=repo, + precision='invalid_precision') + self.assertIsInstance(t1.toTimestamp(), pywikibot.Timestamp) + self.assertRaises(ValueError, t2.toTimestamp) + class TestWbQuantity(WbRepresentationTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863328 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: I694886fd4b264e97c351a8b2a5aefd2b5878be69 Gerrit-Change-Number: 863328 Gerrit-PatchSet: 17 Gerrit-Owner: RPI2026F1 <sarkaraoyan+rpi2026f1(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: RPI2026F1 <sarkaraoyan+rpi2026f1(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2022