Pywikibot-commits December 2023

pywikibot-commits@lists.wikimedia.org

1 participants
65 discussions

[Gerrit] ...core[master]: [L10N] Update languages_by_size
by Meno25 (Code Review) 24 Dec '23

24 Dec '23

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

1 0

[Gerrit] ...core[master]: deprecate pywikibot.version.get_toolforge_hostname()
by jenkins-bot (Code Review) 24 Dec '23

24 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985370 ) Change subject: deprecate pywikibot.version.get_toolforge_hostname() ...................................................................... deprecate pywikibot.version.get_toolforge_hostname() With SGE being removed, the k8s hostname is not relevant Change-Id: Ia81f58bf47fdf7ecc2f53c602cc3b1ab157d6764 --- M pywikibot/version.py M ROADMAP.rst M pywikibot/scripts/version.py 3 files changed, 16 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 0f5d08a..5026fdf 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -36,6 +36,7 @@ Deprecations ------------ +* 9.0.0: ``pywikibot.version.get_toolforge_hostname()`` is deprecated without replacement * 9.0.0: ``iteritems`` method of :class:`data.api.Request` will be removed in favour of ``items`` * 9.0.0: ``SequenceOutputter.output()`` is deprecated in favour of :attr:`tools.formatter.SequenceOutputter.out` property * 9.0.0: *nullcontext* context manager and *SimpleQueue* queue of :mod:`backports` are derecated diff --git a/pywikibot/scripts/version.py b/pywikibot/scripts/version.py index be51af8..9e1f129 100755 --- a/pywikibot/scripts/version.py +++ b/pywikibot/scripts/version.py @@ -16,7 +16,7 @@ import sys import pywikibot -from pywikibot.version import get_toolforge_hostname, getversion +from pywikibot.version import getversion class DummyModule: @@ -80,10 +80,6 @@ pywikibot.info('Python: ' + sys.version) - toolforge_env_hostname = get_toolforge_hostname() - if toolforge_env_hostname: - pywikibot.info('Toolforge hostname: ' + toolforge_env_hostname) - # check environment settings settings = {key for key in os.environ if key.startswith('PYWIKIBOT')} settings.update(['PYWIKIBOT_DIR', 'PYWIKIBOT_DIR_PWB', diff --git a/pywikibot/version.py b/pywikibot/version.py index 318468b..ae872d9 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -26,16 +26,19 @@ from pywikibot.backports import cache from pywikibot.comms.http import fetch from pywikibot.exceptions import VersionParseError +from pywikibot.tools import deprecated def _get_program_dir() -> str: return os.path.normpath(os.path.split(os.path.dirname(__file__))[0]) +@deprecated(since='9.0.0') def get_toolforge_hostname() -> str | None: """Get hostname of the current Toolforge host. .. versionadded:: 3.0 + .. deprecated:: 9.0 :return: The hostname of the currently running host, if it is in Wikimedia Toolforge; otherwise return None. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985370 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: Ia81f58bf47fdf7ecc2f53c602cc3b1ab157d6764 Gerrit-Change-Number: 985370 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] remove code deprecated in 6.x
by jenkins-bot (Code Review) 24 Dec '23

24 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985369 ) Change subject: [cleanup] remove code deprecated in 6.x ...................................................................... [cleanup] remove code deprecated in 6.x Change-Id: I17246e4c3d28336dea7a5b0b219b35be1010f78b --- M pywikibot/exceptions.py M pywikibot/tools/__init__.py M ROADMAP.rst M pywikibot/site/_namespace.py M tests/basesite_tests.py M pywikibot/tools/itertools.py M pywikibot/config.py M pywikibot/site/_basesite.py M tests/site_tests.py 9 files changed, 14 insertions(+), 96 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 67539ce..0f5d08a 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -86,9 +86,3 @@ * 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 * 7.0.0: The i18n identifier 'cosmetic_changes-append' will be removed in favour of 'pywikibot-cosmetic-changes' - -Will be removed in Pywikibot 9 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -* 6.2.0: Error messages with '%' style is deprecated in favour for str.format() style -* 6.0.0: config.register_family_file() is deprecated diff --git a/pywikibot/config.py b/pywikibot/config.py index 57971db..a64f21c 100644 --- a/pywikibot/config.py +++ b/pywikibot/config.py @@ -65,7 +65,6 @@ removesuffix, ) from pywikibot.logging import error, info, warning -from pywikibot.tools import deprecated _DabComDict = DefaultDict[str, Dict[str, str]] @@ -423,16 +422,6 @@ family_files = {} -@deprecated('family_files[family_name] = file_path', since='6.0.0') -def register_family_file(family_name: str, file_path: str) -> None: - """Register a single family class file. - - Parameter file_path may be a path or an url. - family.AutoFamily function is used when the url is given. - """ - family_files[family_name] = file_path - - def register_families_folder(folder_path: str, not_exists_ok: bool = False) -> None: """Register all family class files contained in a directory. diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index d827e17..998c2c8 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -180,7 +180,7 @@ from typing import Any import pywikibot -from pywikibot.tools import ModuleDeprecationWrapper, issue_deprecation_warning +from pywikibot.tools import ModuleDeprecationWrapper from pywikibot.tools._deprecate import _NotImplementedWarning @@ -310,13 +310,6 @@ if re.search(r'\{\w+\}', self.message): msg = self.message.format_map(self.__dict__) - elif re.search(r'%\(\w+\)s', self.message): - issue_deprecation_warning("'%' style messages are deprecated, " - 'please use str.format() style instead', - since='6.2.0') - msg = self.message % self.__dict__ - elif '%s' in self.message: - msg = self.message % page else: msg = self.message.format(page) diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py index 5f59dbd..813cf91 100644 --- a/pywikibot/site/_basesite.py +++ b/pywikibot/site/_basesite.py @@ -24,7 +24,6 @@ from pywikibot.throttle import Throttle from pywikibot.tools import ( ComparableMixin, - SelfCallString, cached, deprecated, first_upper, @@ -216,7 +215,7 @@ @property def sitename(self): """String representing this Site's name and code.""" - return SelfCallString(self.__str__()) + return self.__str__() def __repr__(self) -> str: """Return internal representation.""" diff --git a/pywikibot/site/_namespace.py b/pywikibot/site/_namespace.py index 11b1e54..cbab431 100644 --- a/pywikibot/site/_namespace.py +++ b/pywikibot/site/_namespace.py @@ -12,7 +12,7 @@ from typing import Union from pywikibot.backports import Iterable as IterableType -from pywikibot.tools import ComparableMixin, SelfCallMixin, classproperty +from pywikibot.tools import ComparableMixin, classproperty NamespaceIDType = Union[int, str, 'Namespace'] @@ -323,7 +323,7 @@ return False -class NamespacesDict(Mapping, SelfCallMixin): +class NamespacesDict(Mapping): """ An immutable dictionary containing the Namespace instances. diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index ccf1bb8..caa8763 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -91,9 +91,6 @@ 'normalize_username', 'Version', 'MediaWikiVersion', - 'SelfCallMixin', - 'SelfCallDict', - 'SelfCallString', 'open_archive', 'merge_unique_dicts', 'file_mode_checker', @@ -547,44 +544,6 @@ return self._dev_version < other._dev_version -class SelfCallMixin: - - """ - Return self when called. - - When '_own_desc' is defined it'll also issue a deprecation warning - using issue_deprecation_warning('Calling ' + _own_desc, 'it directly'). - - .. versionadded:: 3.0 - .. deprecated:: 6.2 - """ - - def __call__(self): - """Do nothing and just return itself.""" - issue_deprecation_warning('Referencing this attribute like a function', - 'it directly', since='6.2') - - return self - - -class SelfCallDict(SelfCallMixin, dict): - - """Dict with SelfCallMixin. - - .. versionadded:: 3.0 - .. deprecated:: 6.2 - """ - - -class SelfCallString(SelfCallMixin, str): - - """String with SelfCallMixin. - - .. versionadded:: 3.0 - .. deprecated:: 6.2 - """ - - def open_archive(filename: str, mode: str = 'rb', use_extension: bool = True): """ Open a file and uncompress it if needed. diff --git a/pywikibot/tools/itertools.py b/pywikibot/tools/itertools.py index e3679bb..4a17c43 100644 --- a/pywikibot/tools/itertools.py +++ b/pywikibot/tools/itertools.py @@ -122,15 +122,12 @@ ``genlist`` was renamed to ``iterables``; consecutive iterables are to be used as iterables parameters or '*' to unpack a list - .. deprecated:: 6.4 - ``allow_duplicates`` as positional argument, - ``iterables`` as list or tuple type - .. versionchanged:: 7.0 Reimplemented without threads which is up to 10'000 times faster .. versionchanged:: 9.0 Iterable elements may consist of lists or tuples + ``allow_duplicates`` is a keyword-only argument :param iterables: page generators :param allow_duplicates: optional keyword argument to allow duplicates diff --git a/tests/basesite_tests.py b/tests/basesite_tests.py index 20cb979..29971bb 100755 --- a/tests/basesite_tests.py +++ b/tests/basesite_tests.py @@ -11,7 +11,6 @@ import pywikibot from pywikibot.exceptions import Error -from pywikibot.tools import suppress_warnings from tests.aspects import DefaultSiteTestCase, TestCase, unittest @@ -93,12 +92,6 @@ self.assertIsInstance(mysite.linktrail(), str) self.assertIsInstance(mysite.redirect(), str) - # sitename attribute could also be referenced like a function - - with suppress_warnings(WARN_SELF_CALL, category=FutureWarning): - self.assertEqual(mysite.sitename(), '{}:{}' - .format(self.family, code)) - try: dabcat = mysite.disambcategory() except Error as e: diff --git a/tests/site_tests.py b/tests/site_tests.py index 840b5b2..5ba71e4 100755 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -26,7 +26,6 @@ ) from tests.aspects import ( AlteredDefaultSiteTestCase, - DefaultDrySiteTestCase, DefaultSiteTestCase, DeprecationTestCase, TestCase, @@ -55,20 +54,6 @@ self.assertOneDeprecation() -class TestSiteDryDeprecatedFunctions(DefaultDrySiteTestCase, - DeprecationTestCase): - - """Test cases for Site deprecated methods without a user.""" - - def test_namespaces_callable(self): - """Test that namespaces is callable and returns itself.""" - site = self.get_site() - self.assertIs(site.namespaces(), site.namespaces) - self.assertOneDeprecationParts( - 'Referencing this attribute like a function', - 'it directly') - - class TestSiteObject(DefaultSiteTestCase): """Test cases for Site methods.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985369 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: I17246e4c3d28336dea7a5b0b219b35be1010f78b Gerrit-Change-Number: 985369 Gerrit-PatchSet: 4 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: require PyMySQL >= 1.0.0
by jenkins-bot (Code Review) 24 Dec '23

24 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985362 ) Change subject: require PyMySQL >= 1.0.0 ...................................................................... require PyMySQL >= 1.0.0 With Toolforge removing SGE, we are no longer restricted to what is available on the grid nodes Change-Id: Id5d5b8f8c50ed2d0e005a83c75a500f2f96ffff1 --- M setup.py M pywikibot/data/mysql.py M requirements.txt 3 files changed, 14 insertions(+), 11 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/mysql.py b/pywikibot/data/mysql.py index ea05772..6193a4d 100644 --- a/pywikibot/data/mysql.py +++ b/pywikibot/data/mysql.py @@ -6,11 +6,8 @@ # from __future__ import annotations -import pkg_resources - import pywikibot from pywikibot import config -from pywikibot.backports import removesuffix try: @@ -55,8 +52,6 @@ else: credentials = {'read_default_file': config.db_connect_file} - pymysql_version = pkg_resources.parse_version( - removesuffix(pymysql.__version__, '.None')) args = { 'host': config.db_hostname_format.format(dbname), 'database': config.db_name_format.format(dbname), @@ -66,9 +61,6 @@ } connection = pymysql.connect(**args, **credentials) - if pymysql_version < pkg_resources.parse_version('1.0.0'): - from contextlib import closing - connection = closing(connection) with connection as conn, conn.cursor() as cursor: if verbose: diff --git a/requirements.txt b/requirements.txt index b96e57c..ff2d96d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,8 +47,7 @@ sseclient >= 0.0.18,< 0.0.23 # The mysql generator in pagegenerators depends on PyMySQL -# toolforge uses 0.9.3 -PyMySQL >= 0.9.3 +PyMySQL >= 1.0.0 # core HTML comparison parser in diff module beautifulsoup4>=4.7.1 diff --git a/setup.py b/setup.py index 74957b6..c5da297 100755 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ 'Google': ['google>=1.7'], 'memento': ['memento_client==0.6.1'], 'wikitextparser': ['wikitextparser>=0.47.0'], - 'mysql': ['PyMySQL >= 0.9.3'], # toolforge + 'mysql': ['PyMySQL >= 1.0.0'], # vulnerability found in Pillow<8.1.2 but toolforge uses 5.4.1 'Tkinter': ['Pillow>=8.1.2, != 10.0, != 10.1'], 'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985362 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: Id5d5b8f8c50ed2d0e005a83c75a500f2f96ffff1 Gerrit-Change-Number: 985362 Gerrit-PatchSet: 3 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: eventstreams: stop checking requests version
by jenkins-bot (Code Review) 23 Dec '23

23 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985360 ) Change subject: eventstreams: stop checking requests version ...................................................................... eventstreams: stop checking requests version pywikibot requires requests>=2.21.0 Change-Id: I3525f7fee43280d5d45f86934229ec6e822b5692 --- M pywikibot/comms/eventstreams.py 1 file changed, 15 insertions(+), 10 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py index e0b1f63..8618b87 100644 --- a/pywikibot/comms/eventstreams.py +++ b/pywikibot/comms/eventstreams.py @@ -19,8 +19,6 @@ import json from functools import partial -from pkg_resources import parse_version -from requests import __version__ as requests_version from requests.packages.urllib3.exceptions import ProtocolError from requests.packages.urllib3.util.response import httplib @@ -35,12 +33,6 @@ EventSource = e -if parse_version(requests_version) < parse_version('2.20.1'): - raise ImportError( - 'requests >= 2.20.1 is required for EventStreams;\n' - "install it with 'pip install \"requests>=2.20.1\"'\n") - - class EventStreams(GeneratorWrapper): """Generator class for Server-Sent Events (SSE) protocol. @@ -142,8 +134,10 @@ parameter. """ if isinstance(EventSource, Exception): - raise ImportError('sseclient is required for EventStreams;\n' - 'install it with "pip install sseclient"\n') + raise ImportError( + 'sseclient is required for EventStreams;\n' + 'install it with "pip install sseclient==0.0.22"\n' + ) self.filter = {'all': [], 'any': [], 'none': []} self._total = None self._canary = kwargs.pop('canary', False) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985360 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: I3525f7fee43280d5d45f86934229ec6e822b5692 Gerrit-Change-Number: 985360 Gerrit-PatchSet: 2 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 21 Dec '23

21 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/984826 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I06aafbfd977380a8e7a729612499c77d32a63da2 --- M delinker/sl.json 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/delinker/sl.json b/delinker/sl.json index 6474100..5a4ed2e 100644 --- a/delinker/sl.json +++ b/delinker/sl.json @@ -5,5 +5,5 @@ "Upwinxp" ] }, - "delinker-delink": "Bot: Datoteka [[%(title)s]] je bila odstranjena ali pa jo je izbrisal/a [[:User:%(user)s]]: ''%(comment)s''" + "delinker-delink": "Bot: Datoteka [[%(title)s]] je bila odstranjena ali pa jo je izbrisal_a [[:User:%(user)s]]: ''%(comment)s''" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/984826 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I06aafbfd977380a8e7a729612499c77d32a63da2 Gerrit-Change-Number: 984826 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [requirement] Use "Pillow >= 8.1.2, != 10.0, != 10.1"
by jenkins-bot (Code Review) 20 Dec '23

20 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/984507 ) Change subject: [requirement] Use "Pillow >= 8.1.2, != 10.0, != 10.1" ...................................................................... [requirement] Use "Pillow >= 8.1.2, != 10.0, != 10.1" Bug: T341198 Change-Id: I84f48449f3330918a3655548262b33af65d6be34 --- M .appveyor.yml M setup.py M requirements.txt M pywikibot/userinterfaces/gui.py 4 files changed, 17 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 66cdc07..bbd7bef 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -63,11 +63,10 @@ # Download the AppVeyor Python build accessories into subdirectory .\appveyor - mkdir appveyor - python --version - - python -c "import platform; print(platform.machine())" - python -c "import struct; print('PYTHON_ARCH:', struct.calcsize('P') << 3)" - pip --version - if [%PYTHON_VERSION%]==[3.7.0] pip install "urllib3<2.0" - - if [%PYTHON_ARCH%]==[32] pip install "Pillow >= 8.1.2, < 10.0.0" + - if [%PYTHON_ARCH%]==[32] pip install "Pillow >= 8.1.2, != 10.0, != 10.1" - pip install -r requirements.txt - pip install -r dev-requirements.txt - pip install wikitextparser diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 387a34e..43774f3 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -5,10 +5,10 @@ .. note:: idlelib, tkinter and pillow modules are required. .. warning:: - With Pillow 10 no wheels for 32-bit Python on Windows are supported. - This was made for Python 3.12 compatibility. Either you have to - update your Python using a 64-bit version or you have to - :command:`pip install "pillow < 10.0.0"`. + With Pillow 10.0, 10.1 no wheels for 32-bit Python on Windows are + supported. Pillow 10.2 supports it again. Either you have to update + your Python using a 64-bit version or you have to + :command:`pip install "pillow>8.1.1,!=10.0,!=10.1"`. .. seealso:: :mod:`editor` """ diff --git a/requirements.txt b/requirements.txt index 9d0fd0e..b96e57c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,8 +40,7 @@ python-stdnum >= 1.19 # GUI -Pillow >= 8.1.2, < 10.0.0; platform_machine == 'AMD32' -Pillow >= 8.1.2; platform_machine != 'AMD32' +Pillow >= 8.1.2, != 10.0, != 10.1 # core pagegenerators google >= 1.7 diff --git a/setup.py b/setup.py index 609e4e2..74957b6 100755 --- a/setup.py +++ b/setup.py @@ -46,8 +46,7 @@ 'wikitextparser': ['wikitextparser>=0.47.0'], 'mysql': ['PyMySQL >= 0.9.3'], # toolforge # vulnerability found in Pillow<8.1.2 but toolforge uses 5.4.1 - 'Tkinter': ['Pillow>=8.1.2, < 10.0.0; platform_machine == "AMD32"', - 'Pillow>=8.1.2; platform_machine != "AMD32"'], + 'Tkinter': ['Pillow>=8.1.2, != 10.0, != 10.1'], 'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'], 'html': ['beautifulsoup4>=4.7.1'], 'http': ['fake-useragent>1.2.1'], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/984507 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: I84f48449f3330918a3655548262b33af65d6be34 Gerrit-Change-Number: 984507 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 0

[Gerrit] ...core[master]: [tests] Use urllib2<2 with Python 3.7.0 Appveyor tests
by Xqt (Code Review) 20 Dec '23

20 Dec '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/984481 ) Change subject: [tests] Use urllib2<2 with Python 3.7.0 Appveyor tests ...................................................................... [tests] Use urllib2<2 with Python 3.7.0 Appveyor tests Bug: T353772 Change-Id: I395d01df879a3280bafb074333aaf43e85d9d50a --- M .appveyor.yml 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.appveyor.yml b/.appveyor.yml index 5b8c64e..66cdc07 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -66,6 +66,7 @@ - python -c "import platform; print(platform.machine())" - python -c "import struct; print('PYTHON_ARCH:', struct.calcsize('P') << 3)" - pip --version + - if [%PYTHON_VERSION%]==[3.7.0] pip install "urllib3<2.0" - if [%PYTHON_ARCH%]==[32] pip install "Pillow >= 8.1.2, < 10.0.0" - pip install -r requirements.txt - pip install -r dev-requirements.txt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/984481 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: I395d01df879a3280bafb074333aaf43e85d9d50a Gerrit-Change-Number: 984481 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: update XmlDump and tests
by jenkins-bot (Code Review) 20 Dec '23

20 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/934432 ) Change subject: update XmlDump and tests ...................................................................... update XmlDump and tests 1) 'revisions' parameter added; can be set to earliest, latest or all. 2) _parse_only_earliest() function added. 3) default behavior for XmlDump is now completely preserved as "first_found" option and _parse_only_first_found(). 4) all tests updated to use revisions instead of allrevisions. added tests for _parse_only_earliest() and _parse_only_first_found(). 5) update to f-strings 6) use dispatcher dict for parse method 7) update docstring example w/phab link, add revisions param description Change-Id: Icfc5628a7efda744c53fc30cfc81e9156468b460 --- M tests/xmlreader_tests.py M pywikibot/xmlreader.py 2 files changed, 169 insertions(+), 47 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index a85dbab..5d3575e 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -18,6 +18,7 @@ from __future__ import annotations import re +from typing import Optional, Union try: @@ -25,8 +26,11 @@ except ImportError: from xml.etree.ElementTree import iterparse, ParseError -from pywikibot.backports import Callable -from pywikibot.tools import open_archive +from pywikibot.backports import Callable, Type +from pywikibot.tools import ( + issue_deprecation_warning, + open_archive, +) def parseRestrictions(restrictions): @@ -86,12 +90,15 @@ the `on_error` parameter .. versionchanged:: 7.2 `allrevisions` parameter must be given as keyword parameter + .. versionchanged:: 9.0 + `allrevisions` parameter deprecated due to :phab:`T340804` + `revisions` parameter introduced as replacement Usage example: >>> from pywikibot import xmlreader >>> name = 'tests/data/xml/article-pear.xml' - >>> dump = xmlreader.XmlDump(name, allrevisions=True) + >>> dump = xmlreader.XmlDump(name, revisions='all') >>> for elem in dump.parse(): ... print(elem.title, elem.revisionid) ... @@ -108,22 +115,50 @@ :param on_error: a callable which is invoked within :meth:`parse` method when a ParseError occurs. The exception is passed to this callable. Otherwise the exception is raised. + :param revisions: which of four methods to use to parse the dump: + * `first_found` (whichever revision is the first element) + * `latest` (most recent revision, by largest `revisionid`) + * `earliest` (first revision, by smallest `revisionid`) + * `all` (all revisions for each page) + Default: `first_found` """ - def __init__( - self, - filename, - *, - allrevisions: bool = False, - on_error: Callable[[type[BaseException]], None] | None = None, - ) -> None: + def __init__(self, filename, *, + allrevisions: Union[bool, str] = None, + # when allrevisions removed, revisions can default to 'latest' + revisions: str = 'first_found', + on_error: Optional[ + Callable[[Type[BaseException]], None]] = None) -> None: """Initializer.""" self.filename = filename self.on_error = on_error + + self.rev_actions = { + 'first_found': self._parse_only_first_found, + 'latest': self._parse_only_latest, + 'earliest': self._parse_only_earliest, + 'all': self._parse_all, + } + if allrevisions: - self._parse = self._parse_all - else: - self._parse = self._parse_only_latest + issue_deprecation_warning( + 'allrevisions=True', + "revisions='all'", + since='9.0.0') + revisions = 'all' + elif revisions == 'first_found': + issue_deprecation_warning( + 'allrevisions=False returns first revision found,' + " usually earliest. For most recent, use revisions='latest'. " + "For oldest, use revisions='earliest'," + "'allrevisions'", + since='9.0.0') + + if revisions not in self.rev_actions: + actions = str(list(self.rev_actions.keys())).strip('[]') + raise ValueError(f"'revisions' must be one of {actions}.") + + self._parse = self.rev_actions.get(revisions) def parse(self): """Generator using ElementTree iterparse function. @@ -154,44 +189,81 @@ continue yield from self._parse(event, elem) + def _parse_only_first_found(self, event, elem): + """ + Deprecated parser that yields the first revision found. + + Documentation had wrongly indicated it returned the latest revision. + :phab: `T340804` + """ + if event == 'end' and elem.tag == f'{{{self.uri}}}page': + self._headers(elem) + revision = elem.find(f'{{{self.uri}}}revision') + yield self._create_revision(revision) + elem.clear() + self.root.clear() + def _parse_only_latest(self, event, elem): """Parser that yields only the latest revision.""" - if event == 'end' and elem.tag == '{%s}page' % self.uri: + if event == 'end' and elem.tag == f'{{{self.uri}}}page': self._headers(elem) - revision = elem.find('{%s}revision' % self.uri) - yield self._create_revision(revision) + latest_revision = None + latest_revisionid = 0 + for revision in elem.findall(f'{{{self.uri}}}revision'): + revisionid = int(revision.findtext(f'{{{self.uri}}}id')) + if latest_revision is None or revisionid > latest_revisionid: + latest_revision = revision + latest_revisionid = revisionid + if latest_revision is not None: + yield self._create_revision(latest_revision) + elem.clear() + self.root.clear() + + def _parse_only_earliest(self, event, elem): + """Parser that yields only the earliest revision.""" + if event == 'end' and elem.tag == f'{{{self.uri}}}page': + self._headers(elem) + earliest_revision = None + earliest_revisionid = float('inf') # Initialize positive infinity + for revision in elem.findall(f'{{{self.uri}}}revision'): + revisionid = int(revision.findtext(f'{{{self.uri}}}id')) + if revisionid < earliest_revisionid: + earliest_revisionid = revisionid + earliest_revision = revision + if earliest_revision is not None: + yield self._create_revision(earliest_revision) elem.clear() self.root.clear() def _parse_all(self, event, elem): """Parser that yields all revisions.""" - if event == 'start' and elem.tag == '{%s}page' % self.uri: + if event == 'start' and elem.tag == f'{{{self.uri}}}page': self._headers(elem) - if event == 'end' and elem.tag == '{%s}revision' % self.uri: + if event == 'end' and elem.tag == f'{{{self.uri}}}revision': yield self._create_revision(elem) elem.clear() self.root.clear() def _headers(self, elem) -> None: """Extract headers from XML chunk.""" - self.title = elem.findtext('{%s}title' % self.uri) - self.ns = elem.findtext('{%s}ns' % self.uri) - self.pageid = elem.findtext('{%s}id' % self.uri) - self.restrictions = elem.findtext('{%s}restrictions' % self.uri) - self.isredirect = elem.findtext('{%s}redirect' % self.uri) is not None + self.title = elem.findtext(f'{{{self.uri}}}title') + self.ns = elem.findtext(f'{{{self.uri}}}ns') + self.pageid = elem.findtext(f'{{{self.uri}}}id') + self.restrictions = elem.findtext(f'{{{self.uri}}}restrictions') + self.isredirect = elem.findtext(f'{{{self.uri}}}redirect') is not None self.editRestriction, self.moveRestriction = parseRestrictions( self.restrictions) def _create_revision(self, revision): - """Create a Single revision.""" - revisionid = revision.findtext('{%s}id' % self.uri) - timestamp = revision.findtext('{%s}timestamp' % self.uri) - comment = revision.findtext('{%s}comment' % self.uri) - contributor = revision.find('{%s}contributor' % self.uri) - ipeditor = contributor.findtext('{%s}ip' % self.uri) - username = ipeditor or contributor.findtext('{%s}username' % self.uri) + """Create a single revision.""" + revisionid = revision.findtext(f'{{{self.uri}}}id') + timestamp = revision.findtext(f'{{{self.uri}}}timestamp') + comment = revision.findtext(f'{{{self.uri}}}comment') + contributor = revision.find(f'{{{self.uri}}}contributor') + ipeditor = contributor.findtext(f'{{{self.uri}}}ip') + username = ipeditor or contributor.findtext(f'{{{self.uri}}}username') # could get comment, minor as well - text = revision.findtext('{%s}text' % self.uri) + text = revision.findtext(f'{{{self.uri}}}text') return XmlEntry(title=self.title, ns=self.ns, id=self.pageid, diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index d5864db..0398ad1 100755 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -29,56 +29,85 @@ def test_XmlDumpAllRevs(self): """Test loading all revisions.""" - pages = get_entries('article-pear.xml', allrevisions=True) + pages = get_entries('article-pear.xml', revisions='all') self.assertLength(pages, 4) self.assertEqual('Automated conversion', pages[0].comment) self.assertEqual('Pear', pages[0].title) self.assertEqual('24278', pages[0].id) + self.assertEqual('185185', pages[0].revisionid) + self.assertEqual('188924', pages[3].revisionid) self.assertTrue(pages[0].text.startswith('Pears are [[tree]]s of')) self.assertEqual('Quercusrobur', pages[1].username) self.assertEqual('Pear', pages[0].title) - def test_XmlDumpFirstRev(self): - """Test loading the first revision.""" - pages = get_entries('article-pear.xml', allrevisions=False) + def test_XmlDumpFirstFoundRev(self): + """Test loading the first found revision. + + To be deprecated. + :phab: `T340804` + """ + pages = get_entries('article-pear.xml', revisions='first_found') self.assertLength(pages, 1) self.assertEqual('Automated conversion', pages[0].comment) self.assertEqual('Pear', pages[0].title) self.assertEqual('24278', pages[0].id) + self.assertEqual('185185', pages[0].revisionid) + self.assertTrue(pages[0].text.startswith('Pears are [[tree]]s of')) + self.assertTrue(not pages[0].isredirect) + + def test_XmlDumpEarliestRev(self): + """Test loading the earliest revision.""" + pages = get_entries('article-pear.xml', revisions='earliest') + self.assertLength(pages, 1) + self.assertEqual('Automated conversion', pages[0].comment) + self.assertEqual('Pear', pages[0].title) + self.assertEqual('24278', pages[0].id) + self.assertEqual('185185', pages[0].revisionid) + self.assertTrue(pages[0].text.startswith('Pears are [[tree]]s of')) + self.assertTrue(not pages[0].isredirect) + + def test_XmlDumpLatestRev(self): + """Test loading the latest revision.""" + pages = get_entries('article-pear.xml', revisions='latest') + self.assertLength(pages, 1) + self.assertEqual('sp', pages[0].comment) + self.assertEqual('Pear', pages[0].title) + self.assertEqual('24278', pages[0].id) + self.assertEqual('188924', pages[0].revisionid) self.assertTrue(pages[0].text.startswith('Pears are [[tree]]s of')) self.assertTrue(not pages[0].isredirect) def test_XmlDumpRedirect(self): """Test XmlDump correctly parsing whether a page is a redirect.""" - get_entries('article-pyrus.xml', allrevisions=True) + get_entries('article-pyrus.xml', revisions='all') pages = list(xmlreader.XmlDump( join_xml_data_path('article-pyrus.xml')).parse()) self.assertTrue(pages[0].isredirect) - def _compare(self, previous, variant, all_revisions): + def _compare(self, previous, variant, revisions): """Compare the tested variant with the previous (if not None).""" entries = get_entries('article-pyrus' + variant, - allrevisions=all_revisions) + revisions=revisions) result = [entry.__dict__ for entry in entries] if previous: self.assertEqual(previous, result) return result - def _compare_variants(self, all_revisions): + def _compare_variants(self, revisions): """Compare the different XML file variants.""" previous = None - previous = self._compare(previous, '.xml', all_revisions) - previous = self._compare(previous, '-utf16.xml', all_revisions) - previous = self._compare(previous, '.xml.bz2', all_revisions) - self._compare(previous, '-utf16.xml.bz2', all_revisions) + previous = self._compare(previous, '.xml', revisions) + previous = self._compare(previous, '-utf16.xml', revisions) + previous = self._compare(previous, '.xml.bz2', revisions) + self._compare(previous, '-utf16.xml.bz2', revisions) def test_XmlDump_compare_all(self): """Compare the different XML files using all revisions.""" - self._compare_variants(True) + self._compare_variants('all') def test_XmlDump_compare_single(self): """Compare the different XML files using only a single revision.""" - self._compare_variants(False) + self._compare_variants('latest') class ExportDotTenTestCase(TestCase): @@ -89,7 +118,7 @@ def test_pair(self): """Test reading the main page/user talk page pair file.""" - entries = get_entries('pair-0.10.xml', allrevisions=True) + entries = get_entries('pair-0.10.xml', revisions='all') self.assertLength(entries, 4) for entry in entries: self.assertEqual(entry.username, 'Carlossuarez46') @@ -115,7 +144,7 @@ def test_edit_summary_decoding(self): """Test edit summaries are decoded.""" - entries = get_entries('pair-0.10.xml', allrevisions=True) + entries = get_entries('pair-0.10.xml', revisions='all') articles = [entry for entry in entries if entry.ns == '0'] # It does not decode the edit summary -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/934432 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: Icfc5628a7efda744c53fc30cfc81e9156468b460 Gerrit-Change-Number: 934432 Gerrit-PatchSet: 21 Gerrit-Owner: ElSeiver <ellis.seiver(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Use site.ratelimit for bulk purge in PurgeBot
by jenkins-bot (Code Review) 19 Dec '23

19 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/834036 ) Change subject: [IMPR] Use site.ratelimit for bulk purge in PurgeBot ...................................................................... [IMPR] Use site.ratelimit for bulk purge in PurgeBot Change-Id: If5b1334e66d2f648dbde4ceec2918f87097bb9f6 --- M scripts/touch.py 1 file changed, 22 insertions(+), 6 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/touch.py b/scripts/touch.py index 3fdfbf5..e0ca6c2 100755 --- a/scripts/touch.py +++ b/scripts/touch.py @@ -83,6 +83,7 @@ """Initializer.""" super().__init__(*args, **kwargs) self.pages = defaultdict(list) + self.limit = {} def treat(self, page) -> None: """Purge the given page. @@ -93,6 +94,7 @@ """ # We can have mutiple sites, save pages and cache rate limit self.pages[page.site].append(page) + self.limit.setdefault(page.site, page.site.ratelimit('purge')) self.purgepages() def teardown(self): @@ -110,13 +112,15 @@ def purgepages(self, flush=False): """Purge a bulk of page if rate limit exceeded. - Use default rate limit for purging pages which is 30/60. - .. versionadded:: 8.0 + .. versionchanged:: 9.0 + :meth:`site.APISite.ratelimit() + <pywikibot.site._apisite.APISite.ratelimit>` method is used + to determine bulk length and delay. """ for site, pagelist in self.pages.items(): length = len(pagelist) - if flush or length >= 30: + if flush or length >= self.limit[site].hits: done = site.purgepages(pagelist, **self.opt) if done: self.counter['purge'] += length @@ -124,9 +128,12 @@ pywikibot.info( f"{length} pages{'' if done else ' not'} purged") - if not flush and not config.simulate: - pywikibot.info('Waiting due to purge rate limit') - pywikibot.sleep(62) + if not flush and config.simulate is False: + delay = self.limit[site].delay * (length + 1) + if delay: + pywikibot.info( + f'Waiting {delay} seconds due to purge rate limit') + pywikibot.sleep(delay) def main(*args: str) -> None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/834036 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: If5b1334e66d2f648dbde4ceec2918f87097bb9f6 Gerrit-Change-Number: 834036 Gerrit-PatchSet: 9 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot Gerrit-CC: JAn Dudík <jan.dudik(a)gmail.com> Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2023