Pywikibot-commits November 2021

pywikibot-commits@lists.wikimedia.org

1 participants
66 discussions

[Gerrit] ...core[master]: [cleanup] Deprecate boolean watch parameter in Page.save()

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/735987 ) Change subject: [cleanup] Deprecate boolean watch parameter in Page.save() ...................................................................... [cleanup] Deprecate boolean watch parameter in Page.save() Change-Id: I3d00cbcdf8410ff90768238df50222eeb2f7fb3c --- M pywikibot/page/__init__.py 1 file changed, 16 insertions(+), 13 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 59d5781..f70199f 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1132,16 +1132,21 @@ def save(self, summary: Optional[str] = None, - watch: Union[str, bool, None] = None, + watch: Optional[str] = None, minor: bool = True, botflag: Optional[bool] = None, force: bool = False, asynchronous: bool = False, - callback=None, apply_cosmetic_changes=None, - quiet: bool = False, **kwargs): + callback=None, + apply_cosmetic_changes: Optional[bool] = None, + quiet: bool = False, + **kwargs): """ Save the current contents of page's text to the wiki. + .. versionchanged:: 7.0 + boolean watch parameter is deprecated + :param summary: The edit summary for the modification (optional, but most wikis strongly encourage its use) :param watch: Specify how the watchlist is affected by this edit, set @@ -1151,11 +1156,6 @@ * preferences: use the preference settings (Default) * nochange: don't change the watchlist If None (default), follow bot account's default settings - - For backward compatibility watch parameter may also be boolean: - if True, add or if False, remove this Page to/from bot - user's watchlist. - :type watch: str, bool (deprecated) or None :param minor: if True, mark this edit as minor :param botflag: if True, mark this edit as made by a bot (default: True if user has bot status, False if not) @@ -1170,7 +1170,6 @@ successful. :param apply_cosmetic_changes: Overwrites the cosmetic_changes configuration value to this value unless it's None. - :type apply_cosmetic_changes: bool or None :param quiet: enable/disable successful save operation message; defaults to False. In asynchronous mode, if True, it is up to the calling bot to @@ -1178,10 +1177,14 @@ """ if not summary: summary = config.default_edit_summary - if watch is True: - watch = 'watch' - elif watch is False: - watch = 'unwatch' + + if isinstance(watch, bool): + issue_deprecation_warning( + 'boolean watch parameter', + '"watch", "unwatch", "preferences" or "nochange" value', + since='7.0.0') + watch = ('unwatch', 'watch')[watch] + if not force and not self.botMayEdit(): raise OtherPageSaveError( self, 'Editing restricted by {{bots}}, {{nobots}} ' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/735987 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: I3d00cbcdf8410ff90768238df50222eeb2f7fb3c Gerrit-Change-Number: 735987 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [cleanup] cleanup cosmetic_changes.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/735938 ) Change subject: [cleanup] cleanup cosmetic_changes.py ...................................................................... [cleanup] cleanup cosmetic_changes.py - remove deprecated namespace and pageTitle parameters - remove deprecated diff attribute - remove deprecated from_page() method - update doc Change-Id: Ib0d50866f7f8eced24c0094cf32140cdba845485 --- M pywikibot/cosmetic_changes.py 1 file changed, 18 insertions(+), 58 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index b8d77b3..2f674f7 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -58,7 +58,7 @@ import re from enum import IntEnum -from typing import Any, Optional, Union +from typing import Any, Union import pywikibot from pywikibot import textlib @@ -69,12 +69,7 @@ MultiTemplateMatchBuilder, _get_regexes, ) -from pywikibot.tools import ( - deprecated, - first_lower, - first_upper, - issue_deprecation_warning, -) +from pywikibot.tools import first_lower, first_upper from pywikibot.tools.chars import url2string @@ -221,47 +216,33 @@ class CosmeticChangesToolkit: - """Cosmetic changes toolkit.""" + """Cosmetic changes toolkit. + + .. versionchanged:: 7.0 + `from_page()` method was removed + """ def __init__(self, page: 'pywikibot.page.BasePage', *, show_diff: bool = False, - namespace: Optional[int] = None, - pageTitle: Optional[str] = None, ignore: IntEnum = CANCEL.ALL) -> None: """Initializer. + .. versionchanged:: 5.2 + instantiate the CosmeticChangesToolkit from a page object; + only allow keyword arguments except for page parameter; + `namespace` and `pageTitle` parameters are deprecated + + .. versionchanged:: 7.0 + `namespace` and `pageTitle` parameters were removed + :param page: the Page object containing the text to be modified :param show_diff: show difference after replacements - :param namespace: DEPRECATED namespace parameter - :param pageTitle: DEPRECATED page title parameter :param ignore: ignores if an error occurred and either skips the page or only that method. It can be set one of the CANCEL constants """ - if isinstance(page, pywikibot.BaseSite): - self.site = page - self.title = pageTitle - - class_name = type(self).__name__ - if self.title is None: - raise ValueError('Page title required for ' + class_name) - - try: - self.namespace = self.site.namespaces.resolve(namespace).pop(0) - except (KeyError, TypeError, IndexError): - raise ValueError('{} needs a valid namespace' - .format(class_name)) - issue_deprecation_warning( - 'site parameter of ' + class_name, - 'a pywikibot.Page object as first parameter', - since='20201102') - else: - if namespace is not None or pageTitle is not None: - raise TypeError( - "'namespace' and 'pageTitle' arguments are invalid with " - 'a given Page object') - self.site = page.site - self.title = page.title() - self.namespace = page.namespace() + self.site = page.site + self.title = page.title() + self.namespace = page.namespace() self.show_diff = show_diff self.template = (self.namespace == 10) @@ -294,27 +275,6 @@ if stdnum_isbn: self.common_methods.append(self.fix_ISBN) - @property # type: ignore[misc] - @deprecated('show_diff', since='20200415') - def diff(self) -> bool: - """CosmeticChangesToolkit.diff attribute getter.""" - return self.show_diff - - @diff.setter # type: ignore[misc] - @deprecated('show_diff', since='20200415') - def diff(self, value: bool) -> None: - """CosmeticChangesToolkit.diff attribute setter.""" - self.show_diff = bool(value) - - @classmethod - @deprecated('CosmeticChangesToolkit with pywikibot.Page object', - since='20200415') - def from_page(cls, page: 'pywikibot.page.BasePage', - show_diff: bool = False, - ignore: IntEnum = CANCEL.ALL) -> 'CosmeticChangesToolkit': - """Create toolkit based on the page.""" - return cls(page, show_diff=show_diff, ignore=ignore) - def safe_execute(self, method: Callable[[str], str], text: str) -> str: """Execute the method and catch exceptions if enabled.""" result = None -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/735938 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: Ib0d50866f7f8eced24c0094cf32140cdba845485 Gerrit-Change-Number: 735938 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [IMPR] Use string format style with exception message

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736204 ) Change subject: [IMPR] Use string format style with exception message ...................................................................... [IMPR] Use string format style with exception message Use string format style with AbuseFilterDisallowedError and InvalidPageError message Change-Id: I77e6081e3a2716abf55f7a5c5d9537f15355366b --- M pywikibot/exceptions.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index ef76f0f..b7ceeda 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -473,7 +473,7 @@ .. versionadded:: 6.2 """ - message = 'Page %s is invalid.' + message = 'Page {} is invalid.' class InvalidTitleError(Error): @@ -549,8 +549,8 @@ """Page save failed because the AbuseFilter disallowed it.""" - message = ('Edit to page %(title)s disallowed by the AbuseFilter.\n' - '%(info)s') + message = ('Edit to page {title} disallowed by the AbuseFilter.\n' + '{info}') def __init__(self, page: 'pywikibot.page.Page', info: str, other: str) -> None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736204 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: I77e6081e3a2716abf55f7a5c5d9537f15355366b Gerrit-Change-Number: 736204 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [IMPR] Show an empty string if a environment variable is empty

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736824 ) Change subject: [IMPR] Show an empty string if a environment variable is empty ...................................................................... [IMPR] Show an empty string if a environment variable is empty If a environment variable is empty, nothing is printed. Now show an empty string delimited by quotes if a environment variable is empty. Also use repr() for family names instead of double quotes. Change-Id: Ie044d8e58418ce7e4c756d4b7935b33e8d0d6f80 --- M scripts/version.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/version.py b/scripts/version.py index e4fa31a..9a2cf3d 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -85,15 +85,15 @@ settings.update(['PYWIKIBOT_DIR', 'PYWIKIBOT_DIR_PWB', 'PYWIKIBOT_NO_USER_CONFIG']) for environ_name in sorted(settings): - pywikibot.output('{}: {}'.format(environ_name, - os.environ.get(environ_name, - 'Not set'))) + pywikibot.output( + '{}: {}'.format(environ_name, + os.environ.get(environ_name, 'Not set') or "''")) pywikibot.output('Config base dir: ' + pywikibot.config.base_dir) for family, usernames in pywikibot.config.usernames.items(): if not usernames: continue - pywikibot.output('Usernames for family "{}":'.format(family)) + pywikibot.output('Usernames for family {!r}:'.format(family)) for lang, username in usernames.items(): pywikibot.output('\t{}: {}'.format(lang, username)) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736824 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: Ie044d8e58418ce7e4c756d4b7935b33e8d0d6f80 Gerrit-Change-Number: 736824 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [L10N] Update languages_by_size

by Meno25 (Code Review)

Meno25 has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736512 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size * Update sorting order Change-Id: I3ec2d5a567c1201ba6052426dfbc733178d81220 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py M pywikibot/family.py 5 files changed, 48 insertions(+), 48 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index dc46d77..bba904a 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -31,7 +31,7 @@ languages_by_size = [ 'en', 'hu', 'de', 'fr', 'it', 'pt', 'ja', 'vi', 'es', 'nl', 'pl', 'id', 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'ca', 'eu', 'da', 'ko', 'ba', - 'sv', 'th', 'gl', 'cs', 'sr', 'uk', 'hi', 'hr', 'no', 'tr', 'sa', 'ar', + 'sv', 'th', 'gl', 'cs', 'sr', 'hi', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', 'ta', 'eo', 'sk', 'is', 'ro', 'bn', 'si', 'bg', 'ms', 'mk', 'ka', 'tt', 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'te', 'kk', 'et', 'be', 'ia', 'mr', 'ml', 'oc', 'hy', 'ne', 'cv', 'pa', 'tg', 'ku', 'fy', 'bs', diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 7201186..247deab 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,7 +30,7 @@ languages_by_size = [ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'es', 'it', 'pl', 'arz', 'ja', 'vi', 'war', 'zh', 'ar', 'uk', 'pt', 'fa', 'ca', 'sr', 'id', - 'no', 'ko', 'fi', 'hu', 'cs', 'sh', 'ce', 'tr', 'zh-min-nan', 'ro', + 'no', 'ko', 'fi', 'hu', 'cs', 'sh', 'tr', 'ce', 'zh-min-nan', 'ro', 'eu', 'ms', 'tt', 'eo', 'he', 'hy', 'bg', 'da', 'azb', 'sk', 'kk', 'min', 'et', 'be', 'hr', 'lt', 'el', 'simple', 'az', 'gl', 'sl', 'ur', 'nn', 'ka', 'hi', 'th', 'ta', 'uz', 'la', 'cy', 'ast', 'vo', 'zh-yue', @@ -39,26 +39,26 @@ 'jv', 'pnb', 'ht', 'su', 'lb', 'ba', 'ga', 'szl', 'is', 'ku', 'lmo', 'cv', 'fy', 'tl', 'wuu', 'an', 'sco', 'diq', 'pa', 'ckb', 'yo', 'ne', 'bar', 'io', 'gu', 'als', 'kn', 'scn', 'bpy', 'ia', 'qu', 'mn', 'si', - 'nv', 'bat-smg', 'avk', 'xmf', 'or', 'gd', 'cdo', 'ilo', 'yi', 'am', + 'nv', 'avk', 'bat-smg', 'xmf', 'or', 'gd', 'cdo', 'ilo', 'yi', 'am', 'bug', 'sd', 'nap', 'frr', 'os', 'hsb', 'map-bms', 'mai', 'fo', 'li', 'sah', 'mzn', 'eml', 'ha', 'crh', 'ace', 'ps', 'gor', 'sa', 'bcl', 'wa', 'zh-classical', 'lij', 'zu', 'mrj', 'mhr', 'hif', 'ban', 'shn', 'as', 'hak', 'roa-tara', 'hyw', 'pam', 'ie', 'nso', 'km', 'rue', 'se', - 'bh', 'vls', 'nds-nl', 'sn', 'mi', 'sc', 'nah', 'so', 'sat', 'vep', - 'myv', 'gan', 'glk', 'kab', 'tk', 'mni', 'co', 'bo', 'fiu-vro', 'ab', + 'bh', 'vls', 'nds-nl', 'sn', 'mi', 'sc', 'nah', 'so', 'sat', 'mni', + 'vep', 'myv', 'gan', 'glk', 'kab', 'tk', 'co', 'bo', 'fiu-vro', 'ab', 'kv', 'csb', 'pcd', 'frp', 'udm', 'ug', 'gv', 'ay', 'kw', 'zea', 'ary', 'nrm', 'bjn', 'gn', 'mt', 'lez', 'lfn', 'stq', 'lo', 'mwl', 'skr', 'rm', 'olo', 'smn', 'lad', 'gom', 'fur', 'koi', 'ang', 'dty', 'dsb', 'ext', 'tyv', 'ln', 'cbk-zam', 'dv', 'ksh', 'gag', 'bxr', 'pfl', 'pi', - 'pag', 'av', 'awa', 'ig', 'haw', 'tay', 'rw', 'pap', 'xal', 'krc', - 'szy', 'za', 'pdc', 'kaa', 'ak', 'inh', 'arc', 'to', 'kbp', 'jam', - 'na', 'tpi', 'wo', 'atj', 'kbd', 'tcy', 'nov', 'ki', 'mdf', 'tet', - 'lld', 'bi', 'lg', 'jbo', 'roa-rup', 'lbe', 'kg', 'xh', 'fj', 'ty', - 'srn', 'om', 'shi', 'nqo', 'trv', 'gcr', 'sm', 'chr', 'ltg', 'alt', - 'nia', 'tw', 'ks', 'mnw', 'pih', 'ny', 'got', 'cu', 'st', 'mad', 'kl', - 'dag', 'tn', 'bm', 'ts', 'rmy', 've', 'chy', 'rn', 'tum', 'iu', 'ss', - 'ch', 'pnt', 'ady', 'ik', 'ee', 'ff', 'din', 'sg', 'dz', 'ti', 'cr', - 'ami', 'pwn', + 'pag', 'av', 'ig', 'awa', 'haw', 'tay', 'rw', 'pap', 'xal', 'krc', + 'szy', 'za', 'pdc', 'kaa', 'inh', 'atj', 'arc', 'to', 'kbp', 'tpi', + 'jam', 'na', 'wo', 'kbd', 'tcy', 'tet', 'nov', 'lld', 'ki', 'mdf', + 'ak', 'lg', 'bi', 'jbo', 'roa-rup', 'lbe', 'kg', 'fj', 'xh', 'ty', + 'srn', 'om', 'nqo', 'trv', 'gcr', 'shi', 'sm', 'chr', 'ltg', 'alt', + 'nia', 'mnw', 'tw', 'ks', 'pih', 'ny', 'got', 'cu', 'st', 'mad', 'ami', + 'kl', 'dag', 'tn', 'bm', 'ts', 'rmy', 've', 'chy', 'rn', 'tum', 'iu', + 'ss', 'ch', 'pnt', 'ady', 'ik', 'ee', 'ff', 'din', 'sg', 'dz', 'ti', + 'cr', 'pwn', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 41d4282..2727457 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -28,9 +28,9 @@ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'uk', 'ar', 'cs', 'gu', 'mul', 'pt', 'sr', 'fa', 'sv', 'hu', 'ko', 'ml', 'bn', 'sa', 'ta', 'te', 'sl', 'hy', 'el', 'tr', 'vi', 'la', 'ro', 'fi', 'ja', - 'nap', 'az', 'nl', 'ca', 'br', 'kn', 'hr', 'no', 'th', 'eo', 'is', - 'be', 'vec', 'hi', 'id', 'pms', 'ban', 'da', 'lij', 'et', 'mk', 'yi', - 'as', 'mr', 'bg', 'li', 'lt', 'wa', 'jv', 'or', 'pa', 'eu', 'cy', 'gl', + 'nap', 'az', 'nl', 'ca', 'br', 'kn', 'hr', 'no', 'th', 'eo', 'hi', + 'is', 'be', 'vec', 'id', 'pms', 'ban', 'da', 'lij', 'et', 'mk', 'yi', + 'as', 'mr', 'bg', 'li', 'lt', 'wa', 'jv', 'or', 'pa', 'cy', 'eu', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 678e6b4..0a72ee4 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -32,16 +32,16 @@ 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'et', 'id', 'cs', 'ml', 'my', 'uz', 'li', 'or', 'te', 'eo', 'fa', 'ar', 'gl', 'jv', 'oc', 'az', 'eu', 'uk', 'br', 'skr', 'ast', 'da', 'lo', 'simple', 'bn', 'is', 'la', - 'hr', 'fj', 'tg', 'ky', 'sk', 'bg', 'wa', 'ur', 'ps', 'cy', 'vo', - 'shn', 'sl', 'he', 'af', 'zh-min-nan', 'scn', 'om', 'tl', 'pa', 'sw', + 'hr', 'fj', 'tg', 'ky', 'sk', 'bg', 'wa', 'ur', 'ps', 'cy', 'shn', + 'vo', 'sl', 'he', 'af', 'zh-min-nan', 'scn', 'om', 'tl', 'pa', 'sw', 'fy', 'nn', 'ka', 'lv', 'min', 'sq', 'nds', 'co', 'ms', 'mn', 'pnb', - 'lb', 'bs', 'nah', 'yue', 'mnw', 'sa', 'kk', 'km', 'diq', 'vec', 'be', - 'tk', 'mk', 'sm', 'hsb', 'shy', 'nia', 'ga', 'gd', 'an', 'wo', 'mni', - 'ks', 'gom', 'su', 'mr', 'ia', 'ang', 'mt', 'fo', 'tt', 'sd', 'gn', - 'ie', 'so', 'csb', 'ug', 'bcl', 'si', 'st', 'roa-rup', 'hif', 'zu', - 'kl', 'mi', 'ay', 'jbo', 'ln', 'yi', 'ha', 'gu', 'na', 'gv', 'kw', - 'tpi', 'ne', 'rw', 'ts', 'qu', 'ss', 'chr', 'iu', 'am', 'dv', 'sg', - 'ti', 'tn', 'lmo', + 'lb', 'lmo', 'bs', 'nah', 'yue', 'mnw', 'sa', 'kk', 'km', 'diq', 'vec', + 'be', 'tk', 'mk', 'sm', 'hsb', 'nia', 'shy', 'ga', 'gd', 'an', 'wo', + 'mni', 'ks', 'gom', 'su', 'mr', 'ia', 'ang', 'mt', 'fo', 'tt', 'sd', + 'gn', 'ie', 'so', 'csb', 'ug', 'bcl', 'si', 'st', 'roa-rup', 'hif', + 'zu', 'kl', 'mi', 'ay', 'jbo', 'ln', 'yi', 'ha', 'gu', 'na', 'gv', + 'kw', 'tpi', 'ne', 'rw', 'ts', 'qu', 'ss', 'chr', 'iu', 'am', 'dv', + 'sg', 'ti', 'tn', ] category_redirect_templates = { diff --git a/pywikibot/family.py b/pywikibot/family.py index 45b80b4..a79af7d 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -101,17 +101,17 @@ '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', 'pnb', 'pap', 'ps', 'jam', 'koi', 'km', 'pcd', 'pms', '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', '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', + 'pag', 'ami', 'pnb', 'pap', 'ps', 'jam', 'koi', 'km', 'pcd', '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', '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 @@ -138,17 +138,17 @@ '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', 'pnb', 'pap', 'ps', 'jam', 'km', - 'pcd', 'pms', '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', + 'hz', 'uz', 'pa', 'pi', 'pfl', 'pag', 'ami', 'pnb', 'pap', 'ps', 'jam', + 'km', 'pcd', '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 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736512 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: I3ec2d5a567c1201ba6052426dfbc733178d81220 Gerrit-Change-Number: 736512 Gerrit-PatchSet: 4 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 6 months

[Gerrit] ...core[master]: [bugfix]: Upload: Only set filekey/offset for files with names

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736464 ) Change subject: [bugfix]: Upload: Only set filekey/offset for files with names ...................................................................... [bugfix]: Upload: Only set filekey/offset for files with names When copy-uploading, the filekey and offset should not be set, as this applies only when there is a filename, but during a copy-upload, there is only a URL. Bug: T294916 Change-Id: I38d0915ca46f2e144522e4c63961b3dc09a1943f --- M pywikibot/site/_apisite.py 1 file changed, 19 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 4d11d71..8a7854f 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -2863,26 +2863,35 @@ if result['result'] == 'Warning': assert 'warnings' in result and not ignore_all_warnings - if 'filekey' in result: - _file_key = result['filekey'] - elif 'sessionkey' in result: - # TODO: Probably needs to be reflected in the API call - # above - _file_key = result['sessionkey'] - pywikibot.warning('Using sessionkey instead of filekey.') + + if source_filename: + if 'filekey' in result: + _file_key = result['filekey'] + elif 'sessionkey' in result: + # TODO: Probably needs to be reflected in the API call + # above + _file_key = result['sessionkey'] + pywikibot.warning( + 'Using sessionkey instead of filekey.') + else: + _file_key = None + pywikibot.warning('No filekey defined.') else: _file_key = None - pywikibot.warning('No filekey defined.') if not report_success: - result.setdefault('offset', True) + if source_filename: + offset = result.setdefault('offset', True) + else: + offset = False + if ignore_warnings(create_warnings_list(result)): return self.upload( filepage, source_filename=source_filename, source_url=source_url, comment=comment, text=text, watch=watch, ignore_warnings=True, chunk_size=chunk_size, asynchronous=asynchronous, - _file_key=_file_key, _offset=result['offset'], + _file_key=_file_key, _offset=offset, report_success=False) return False -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736464 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: I38d0915ca46f2e144522e4c63961b3dc09a1943f Gerrit-Change-Number: 736464 Gerrit-PatchSet: 3 Gerrit-Owner: Inductiveload <inductiveload(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 6 months

[Gerrit] ...core[master]: Drop the other attribute for AbuseFilterDisallowedError

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736322 ) Change subject: Drop the other attribute for AbuseFilterDisallowedError ...................................................................... Drop the other attribute for AbuseFilterDisallowedError Bug: T294822 Change-Id: Iee242bdddd6cc2897db1acf79ef256427a3026d4 --- M pywikibot/exceptions.py M pywikibot/site/_apisite.py 2 files changed, 2 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index ef76f0f..dc7cde2 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -552,11 +552,9 @@ message = ('Edit to page %(title)s disallowed by the AbuseFilter.\n' '%(info)s') - def __init__(self, page: 'pywikibot.page.Page', info: str, - other: str) -> None: + def __init__(self, page: 'pywikibot.page.Page', info: str) -> None: """Initializer.""" self.info = info - self.other = other super().__init__(page) diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 67ea3ed..4d11d71 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -1641,11 +1641,7 @@ exception.format_map(errdata) ) from None if issubclass(exception, AbuseFilterDisallowedError): - errdata = { - 'info': err.info, - 'other': err.other, - } - raise exception(page, **errdata) from None + raise exception(page, info=err.info) from None if issubclass(exception, SpamblacklistError): urls = ', '.join(err.other[err.code]['matches']) raise exception(page, url=urls) from None -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736322 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: Iee242bdddd6cc2897db1acf79ef256427a3026d4 Gerrit-Change-Number: 736322 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 6 months

[Gerrit] ...core[master]: [doc] update ROADMAP.rst and CHANGELOG.md

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736181 ) Change subject: [doc] update ROADMAP.rst and CHANGELOG.md ...................................................................... [doc] update ROADMAP.rst and CHANGELOG.md Change-Id: Iecaaa4391ef3fd6eb94e398517802e173f9699f6 --- M ROADMAP.rst M scripts/CHANGELOG.md 2 files changed, 14 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 0b525c1..817a239 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,6 +4,8 @@ Improvements and Bugfixes ------------------------- +* Update invisible characters from unicodedata 14.0.0 +* Make site parameter of textlib.replace_links() mandatory (T294649) * Raise a generic ServerError if the http status code is unofficial (T293208) * Add support for Wikimedia OCR engine with proofreadpage * Rewrite tools.intersect_generators which makes it running up to 10'000 times faster. (T85623, T293276) @@ -22,6 +24,13 @@ Code cleanups ------------- +* Remove deprecated BaseSite namespace shortcuts +* Remove deprecated Family.get_cr_templates method in favour of Site.category_redirects() +* Remove deprecated Page.put_async() method (T193494) +* Ignore baserevid parameter for several DataSite methods +* Remove deprecated preloaditempages method +* Remove disable_ssl_certificate_validation kwargs in http functions in favour of verify parameter (T265206) +* Deprecated PYWIKIBOT2 environment variables were removed * version.ParseError was removed in favour of exceptions.VersionParseError * specialbots.EditReplacement and specialbots.EditReplacementError were removed in favour of exceptions.EditReplacementError * site.PageInUse exception was removed in favour of exceptions.PageInUseError @@ -57,9 +66,9 @@ Deprecations ^^^^^^^^^^^^ +* 7.0.0: baserevid parameter of editSource(), editQualifier(), removeClaims(), removeSources(), remove_qualifiers() DataSite methods will be removed * 7.0.0: Values of APISite.allpages() parameter filterredir other than True, False and None are deprecated * 6.5.0: OutputOption.output() method will be removed in favour of OutputOption.out property * 6.4.0: Pywikibot `began using semantic versioning <https://www.mediawiki.org/wiki/Manual:Pywikibot/Development/Guidelines#Depr…>`_, all deprecated code will be removed in Pywikibot version 7.0.0. -* 5.0.0: Methods deprecated for 5 years or longer will be removed diff --git a/scripts/CHANGELOG.md b/scripts/CHANGELOG.md index 138d75d..b87f57f 100644 --- a/scripts/CHANGELOG.md +++ b/scripts/CHANGELOG.md @@ -23,6 +23,9 @@ ### commonscat * Ignore InvalidTitleError in CommonscatBot.findCommonscatLink (T291783) +### cosmetic_changes +* Ignore InvalidTitleError in CosmeticChangesBot.treat_page (T293612) + ### djvutext * pass site arg only once (T292367) @@ -88,7 +91,7 @@ * Enable multiple sites (T57083) * Use new textlib.add_text function -### cosmetic_changeds +### cosmetic_changes * set -ignore option to CANCEL.MATCH by default (T108446) ### fixing_redirects -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/736181 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: Iecaaa4391ef3fd6eb94e398517802e173f9699f6 Gerrit-Change-Number: 736181 Gerrit-PatchSet: 2 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

2 years, 6 months

[Gerrit] ...core[master]: [cleanup] remove deprecated namespace shortcuts

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/735953 ) Change subject: [cleanup] remove deprecated namespace shortcuts ...................................................................... [cleanup] remove deprecated namespace shortcuts Change-Id: I19382a04fefe9592271a711175666576c3d68d03 --- M pywikibot/site/_basesite.py M tests/site_tests.py 2 files changed, 0 insertions(+), 38 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py index 3a3a605..0b74060 100644 --- a/pywikibot/site/_basesite.py +++ b/pywikibot/site/_basesite.py @@ -22,7 +22,6 @@ from pywikibot.tools import ( ComparableMixin, SelfCallString, - deprecated, first_upper, normalize_username, ) @@ -402,33 +401,6 @@ name2 = first_upper(name2) return name1 == name2 - # namespace shortcuts for backwards-compatibility - - @deprecated('namespaces.SPECIAL.custom_name', since='20160407') - def special_namespace(self): - """Return local name for the Special: namespace.""" - return self.namespace(-1) - - @deprecated('namespaces.FILE.custom_name', since='20160407') - def image_namespace(self): - """Return local name for the File namespace.""" - return self.namespace(6) - - @deprecated('namespaces.MEDIAWIKI.custom_name', since='20160407') - def mediawiki_namespace(self): - """Return local name for the MediaWiki namespace.""" - return self.namespace(8) - - @deprecated('namespaces.TEMPLATE.custom_name', since='20160407') - def template_namespace(self): - """Return local name for the Template namespace.""" - return self.namespace(10) - - @deprecated('namespaces.CATEGORY.custom_name', since='20160407') - def category_namespace(self): - """Return local name for the Category namespace.""" - return self.namespace(14) - # site-specific formatting preferences def category_on_one_line(self): diff --git a/tests/site_tests.py b/tests/site_tests.py index ef485a5..73eac0b 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -60,16 +60,6 @@ self.assertFalse(page.isRedirectPage()) self.assertOneDeprecation() - def test_namespace_shortcuts(self): - """Test namespace shortcuts.""" - self.assertEqual(self.site.image_namespace(), self.site.namespace(6)) - self.assertEqual(self.site.mediawiki_namespace(), - self.site.namespace(8)) - self.assertEqual(self.site.template_namespace(), - self.site.namespace(10)) - self.assertEqual(self.site.category_namespace(), - self.site.namespace(14)) - class TestSiteDryDeprecatedFunctions(DefaultDrySiteTestCase, DeprecationTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/735953 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: I19382a04fefe9592271a711175666576c3d68d03 Gerrit-Change-Number: 735953 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 6 months

[Gerrit] ...core[master]: [cleanup] remove deprecated Family.get_cr_templates method

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/735954 ) Change subject: [cleanup] remove deprecated Family.get_cr_templates method ...................................................................... [cleanup] remove deprecated Family.get_cr_templates method Change-Id: I7454a1dabed3c44f758569dc54046c87c0eb6f67 --- M pywikibot/family.py 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 006c548..45b80b4 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -650,11 +650,6 @@ cr_set.add(newtitle) self._catredirtemplates[code] = list(cr_template_tuple) + list(cr_set) - @deprecated('site.category_redirects()', since='20170608') - def get_cr_templates(self, code, fallback): - """DEPRECATED: Build list of category redirect templates.""" - self._get_cr_templates(code, fallback) - def get_edit_restricted_templates(self, code): """Return tuple of edit restricted templates. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/735954 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: I7454a1dabed3c44f758569dc54046c87c0eb6f67 Gerrit-Change-Number: 735954 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 6 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits November 2021