Pywikibot-commits April 2021

pywikibot-commits@lists.wikimedia.org

1 participants
138 discussions

[Gerrit] ...core[master]: [bugfix] proofreadpage: search for "new" class after purge

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680390 ) Change subject: [bugfix] proofreadpage: search for "new" class after purge ...................................................................... [bugfix] proofreadpage: search for "new" class after purge Also show a FutureWarning with deprecated Soup identifier Bug: T280357 Change-Id: Ie0aed053186cd06a8170dd21ae26e2991bb01f2f --- M pywikibot/proofreadpage.py 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index e8cb902..656a4b1 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -889,7 +889,9 @@ # </a> # Try to purge or raise ValueError. - if not self._soup.find_all('a', attrs=attrs): + found = self._soup.find_all('a', attrs=attrs) + attrs = {'class': re.compile('prp-pagequality|new')} + if not found: self.purge() del self._parsed_text self._parsed_text = self._get_parsed_page() @@ -900,7 +902,6 @@ 'class="new" in: {}.'.format(self)) # Search for attribute "prp-pagequality" or "new" in tags: - attrs = {'class': re.compile('prp-pagequality|new')} page_cnt = 0 for a_tag in self._soup.find_all('a', attrs=attrs): label = a_tag.text.lstrip('0') # Label is not converted to int. @@ -1096,4 +1097,4 @@ wrapper = ModuleDeprecationWrapper(__name__) wrapper._add_deprecated_attr('Soup', _bs4_soup, replacement_name='_bs4_soup', - since='20181128') + since='20181128', future_warning=True) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680390 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: Ie0aed053186cd06a8170dd21ae26e2991bb01f2f Gerrit-Change-Number: 680390 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Inductiveload <inductiveload(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [doc] Add specialbots to doc

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680585 ) Change subject: [doc] Add specialbots to doc ...................................................................... [doc] Add specialbots to doc Sphinx uses __all__ to include code parts into Bug: T280316 Change-Id: I38eef18829506358bba2df835da811a7de2a744a --- M pywikibot/specialbots/__init__.py 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/specialbots/__init__.py b/pywikibot/specialbots/__init__.py index e049a28..97b36dc 100644 --- a/pywikibot/specialbots/__init__.py +++ b/pywikibot/specialbots/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python """Module containing special bots reusable by scripts.""" # -# (C) Pywikibot team, 2020 +# (C) Pywikibot team, 2020-2021 # # Distributed under the terms of the MIT license. # @@ -9,3 +9,11 @@ EditReplacement, InteractiveUnlink, BaseUnlinkBot ) from pywikibot.specialbots._upload import UploadRobot + + +__all__ = ( + 'BaseUnlinkBot', + 'EditReplacement', + 'InteractiveUnlink', + 'UploadRobot', +) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680585 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: I38eef18829506358bba2df835da811a7de2a744a Gerrit-Change-Number: 680585 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [cleanup] Drop unused YahooSearchPageGenerator deprecation

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680499 ) Change subject: [cleanup] Drop unused YahooSearchPageGenerator deprecation ...................................................................... [cleanup] Drop unused YahooSearchPageGenerator deprecation Yahoo search wasn't functional and has been removed. Dropping its deprecation clause. Change-Id: I38feae8357d31725481b83a48faadc54ad339d32 --- M pywikibot/pagegenerators.py 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index f2b2033..3d85afb 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -50,7 +50,6 @@ filter_unique, intersect_generators, itergroup, - ModuleDeprecationWrapper, redirect_func, ) @@ -3001,9 +3000,6 @@ CategoryGenerator = redirect_func( PageClassGenerator, old_name='CategoryGenerator', since='20161017', future_warning=True) -wrapper = ModuleDeprecationWrapper(__name__) -wrapper._add_deprecated_attr('YahooSearchPageGenerator', replacement_name='', - since='20181128') if __name__ == '__main__': # pragma: no cover pywikibot.output('Pagegenerators cannot be run as script - are you ' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680499 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: I38feae8357d31725481b83a48faadc54ad339d32 Gerrit-Change-Number: 680499 Gerrit-PatchSet: 2 Gerrit-Owner: Damian <atagar1(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [cleanup] Don't explicitly subclass object

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680480 ) Change subject: [cleanup] Don't explicitly subclass object ...................................................................... [cleanup] Don't explicitly subclass object Python 2.x encouraged developers to subclass object to construct 'new style' classes. However, Python 3.x dropped 'old style' classes and now subclass object by default. Change-Id: I027813820ce867309f0ebb852e59444b223713af --- M pywikibot/xmlreader.py M tests/deprecation_tests.py M tests/login_tests.py M tests/sparql_tests.py M tests/tools_tests.py M tests/utils.py 6 files changed, 12 insertions(+), 12 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index 3e9579d..1213355 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -90,7 +90,7 @@ xml.sax.parse(self.filename, self.handler) -class XmlDump(object): +class XmlDump: """ Represents an XML dump file. diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py index 00221b7..7b0933c 100644 --- a/tests/deprecation_tests.py +++ b/tests/deprecation_tests.py @@ -160,7 +160,7 @@ return foo -class DeprecatedMethodClass(object): +class DeprecatedMethodClass: """Class with methods deprecated.""" @@ -241,7 +241,7 @@ @deprecated() -class DeprecatedClassNoInit(object): +class DeprecatedClassNoInit: """Deprecated class.""" @@ -249,7 +249,7 @@ @deprecated() -class DeprecatedClass(object): +class DeprecatedClass: """Deprecated class.""" diff --git a/tests/login_tests.py b/tests/login_tests.py index 40bc70a..337a233 100644 --- a/tests/login_tests.py +++ b/tests/login_tests.py @@ -21,13 +21,13 @@ from tests import mock -class FakeFamily(object): +class FakeFamily: """Mock.""" name = '~FakeFamily' -class FakeSite(object): +class FakeSite: """Mock.""" code = '~FakeCode' @@ -37,7 +37,7 @@ FakeUsername = '~FakeUsername' -class FakeConfig(object): +class FakeConfig: """Mock.""" usernames = defaultdict(dict) diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index 0f4420b..2c510cf 100644 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -82,7 +82,7 @@ """ -class Container(object): +class Container: """Simple test container for return values.""" def __init__(self, value): @@ -171,7 +171,7 @@ self.assertFalse(res) -class Shared(object): +class Shared: """Shared test placeholder.""" class SparqlNodeTests(TestCase): diff --git a/tests/tools_tests.py b/tests/tools_tests.py index cda8191..a5da99d 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -703,7 +703,7 @@ )) -class Foo(object): +class Foo: """Test class to verify classproperty decorator.""" diff --git a/tests/utils.py b/tests/utils.py index ef024c5..08f2d11 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -174,7 +174,7 @@ return log -class AssertAPIErrorContextManager(object): +class AssertAPIErrorContextManager: """ Context manager to assert certain APIError exceptions. @@ -242,7 +242,7 @@ return {'name': name, 'limit': None} -class DummySiteinfo(object): +class DummySiteinfo: """Dummy class to use instead of L{pywikibot.site.Siteinfo}.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680480 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: I027813820ce867309f0ebb852e59444b223713af Gerrit-Change-Number: 680480 Gerrit-PatchSet: 1 Gerrit-Owner: Damian <atagar1(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [IMPR] catch LocationParseError in reflinks.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680379 ) Change subject: [IMPR] catch LocationParseError in reflinks.py ...................................................................... [IMPR] catch LocationParseError in reflinks.py - urllib3.LocationParseError derives from ValueError. Ignore this exception and continue with next link - remove URLError because urllib is no longer used Bug: T280356 Change-Id: I7414fc580dd28343e9ceb3c6f145cc5d8ad877d9 --- M pywikibot/comms/http.py M scripts/reflinks.py 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Rubin: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 65cddd1..ecb9f90 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -291,7 +291,7 @@ if isinstance(response, Exception): with suppress(Exception): - # request.data exception may contain response and request attribute + # request exception may contain response and request attribute error('An error occurred for uri ' + response.request.url) raise response from None diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 7044c21..0bfeb95 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -51,7 +51,6 @@ from functools import partial from http import HTTPStatus from textwrap import shorten -from urllib.error import URLError import pywikibot @@ -605,15 +604,16 @@ ref.url, page.title(as_link=True))) continue - except (URLError, + except (ValueError, # urllib3.LocationParseError derives from it socket.error, IOError, httplib.error, pywikibot.FatalServerError, pywikibot.Server414Error, pywikibot.Server504Error) as e: - pywikibot.output("Can't retrieve page {} : {}" - .format(ref.url, e)) + pywikibot.output( + "{err.__class__.__name__}: Can't retrieve url {url}: {err}" + .format(url=ref.url, err=e)) continue linkedpagetext = r.content -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680379 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: I7414fc580dd28343e9ceb3c6f145cc5d8ad877d9 Gerrit-Change-Number: 680379 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Rubin <rubin.happy(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [bugfix] fix stripping author_page_name in is_wikisource_author_page()

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680408 ) Change subject: [bugfix] fix stripping author_page_name in is_wikisource_author_page() ...................................................................... [bugfix] fix stripping author_page_name in is_wikisource_author_page() Bug: T280328 Change-Id: I356153f45199fb9d5957aedde0e987c93f443e6a --- M scripts/patrol.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/patrol.py b/scripts/patrol.py index f33f956..fe15dfc 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -272,7 +272,7 @@ author_ns_prefix = self.site.namespace(author_ns) + ':' author_page_name = removeprefix(title, author_ns_prefix) - if title != author_ns_prefix: + if title != author_page_name: verbose_output('Found author ' + author_page_name) return True return False -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680408 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: I356153f45199fb9d5957aedde0e987c93f443e6a Gerrit-Change-Number: 680408 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [doc] Update documentation

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680350 ) Change subject: [doc] Update documentation ...................................................................... [doc] Update documentation Some improvements to doc: * http --> https and update URL * api --> API * Full stop not part of the URL * arabic --> Arabic * pypi --> PyPI ** See https://pypi.org/ Change-Id: I435139a09184e1d13f57b6d4b3ff058490b299e3 --- M CONTENT.rst M pywikibot/cosmetic_changes.py M scripts/archive/data_ingestion.py M scripts/archive/flickrripper.py 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved DannyS712: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/CONTENT.rst b/CONTENT.rst index f9a1b5c..230992c 100644 --- a/CONTENT.rst +++ b/CONTENT.rst @@ -20,7 +20,7 @@ +---------------------------+-----------------------------------------------------------+ | generate_user_files.py | Creates user-config.py or user-fixes.py | +---------------------------+-----------------------------------------------------------+ - | HISTORY.rst | pypi version history file | + | HISTORY.rst | PyPI version history file | +---------------------------+-----------------------------------------------------------+ | LICENSE | Reference to the MIT license | +---------------------------+-----------------------------------------------------------+ @@ -32,7 +32,7 @@ +---------------------------+-----------------------------------------------------------+ | requirements.txt | General PIP requirements file | +---------------------------+-----------------------------------------------------------+ - | ROADMAP.rst | pypi version roadmap file | + | ROADMAP.rst | PyPI version roadmap file | +---------------------------+-----------------------------------------------------------+ | setup.py | Installer script for Pywikibot framework | +---------------------------+-----------------------------------------------------------+ diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index f6f0929..3c085ee 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -968,7 +968,7 @@ return text def fixArabicLetters(self, text): - """Fix arabic and persian letters.""" + """Fix Arabic and Persian letters.""" if self.site.code not in ['ckb', 'fa']: return text diff --git a/scripts/archive/data_ingestion.py b/scripts/archive/data_ingestion.py index 10a7cb4..b6111dd 100755 --- a/scripts/archive/data_ingestion.py +++ b/scripts/archive/data_ingestion.py @@ -164,7 +164,7 @@ """ Find duplicates of the photo. - Calculates the SHA1 hash and asks the MediaWiki api + Calculates the SHA1 hash and asks the MediaWiki API for a list of duplicates. TODO: Add exception handling, fix site thing diff --git a/scripts/archive/flickrripper.py b/scripts/archive/flickrripper.py index 758b77c..4fdfaeb 100755 --- a/scripts/archive/flickrripper.py +++ b/scripts/archive/flickrripper.py @@ -42,7 +42,7 @@ Tkdialog = _tk_error try: - import flickrapi # see: http://stuvel.eu/projects/flickrapi + import flickrapi # see: https://stuvel.eu/software/flickrapi/ except ImportError as e: flickrapi = e @@ -144,7 +144,7 @@ def getFlinfoDescription(photo_id): """ - Get the description from http://wikipedia.ramselehof.de/flinfo.php. + Get the description from http://wikipedia.ramselehof.de/flinfo.php TODO: Add exception handling, try a couple of times """ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680350 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: I435139a09184e1d13f57b6d4b3ff058490b299e3 Gerrit-Change-Number: 680350 Gerrit-PatchSet: 9 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [cleanup] Remove deprecated code parts

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680256 ) Change subject: [cleanup] Remove deprecated code parts ...................................................................... [cleanup] Remove deprecated code parts - remove APISite.resolvemagicwords() - remove BaseSite.ns_index() - remove BaseSite.getNamespaceIndex() - update tests Change-Id: I650f86101fe206ee2bf1340a0c9262bf375a00dc --- M pywikibot/site/_apisite.py M pywikibot/site/_basesite.py M tests/site_tests.py 3 files changed, 0 insertions(+), 33 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index eb94bae..9619c38 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -822,15 +822,6 @@ return self._magicwords[word] return [word] - @deprecated('expand_text', since='20150831', future_warning=True) - def resolvemagicwords(self, wikitext): # pragma: no cover - """ - Replace the {{ns:xx}} marks in a wikitext with the namespace names. - - DEPRECATED. - """ - return self.expand_text(wikitext) - @remove_last_args(('default', )) def redirect(self): """Return the localized #REDIRECT keyword.""" diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py index 34f9750..7c790f8 100644 --- a/pywikibot/site/_basesite.py +++ b/pywikibot/site/_basesite.py @@ -242,25 +242,6 @@ yield base_path + '?title=' yield self.article_path - @deprecated('APISite.namespaces.lookup_name', since='20150703', - future_warning=True) - def ns_index(self, namespace): # pragma: no cover - """ - Return the Namespace for a given namespace name. - - @param namespace: name - @type namespace: str - @return: The matching Namespace object on this Site - @rtype: Namespace, or None if invalid - """ - return self.namespaces.lookup_name(namespace) - - @deprecated('APISite.namespaces.lookup_name', since='20150703', - future_warning=True) # noqa: N802 - def getNamespaceIndex(self, namespace): - """DEPRECATED: Return the Namespace for a given namespace name.""" - return self.namespaces.lookup_name(namespace) - def _build_namespaces(self): """Create default namespaces.""" return Namespace.builtin_namespaces() diff --git a/tests/site_tests.py b/tests/site_tests.py index 877445d..b3362b5 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -78,11 +78,6 @@ self.assertFalse(page.isRedirectPage()) self.assertOneDeprecation() - def test_ns_index(self): - """Test ns_index.""" - self.assertEqual(self.site.ns_index('MediaWiki'), 8) - self.assertOneDeprecation() - def test_namespace_shortcuts(self): """Test namespace shortcuts.""" self.assertEqual(self.site.image_namespace(), self.site.namespace(6)) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680256 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: I650f86101fe206ee2bf1340a0c9262bf375a00dc Gerrit-Change-Number: 680256 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

3 years, 1 month

[Gerrit] ...core[master]: [cleanup] Deprecate frozenmap

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680041 ) Change subject: [cleanup] Deprecate frozenmap ...................................................................... [cleanup] Deprecate frozenmap PEP 416 considered adding a frozendict [1] but added a MappingProxyType class to types that does the same instead [2][3]. Switching us to the builtin class. [1] https://www.python.org/dev/peps/pep-0416/ [2] https://stackoverflow.com/a/38770783 [3] https://docs.python.org/3/library/types.html#types.MappingProxyType Change-Id: Ife5c3f09facbbdea67cb1fa0bd46d6af9e6b01b1 --- M pywikibot/family.py M pywikibot/tools/__init__.py M scripts/archivebot.py M tests/family_tests.py 4 files changed, 20 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 01ec119..c122af1 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -9,6 +9,7 @@ import re import string import sys +import types import urllib.parse as urlparse import warnings @@ -26,7 +27,6 @@ classproperty, deprecated, deprecated_args, - frozenmap, ModuleDeprecationWrapper, ) @@ -954,7 +954,7 @@ """ data = {code: None for code in self.interwiki_removals} data.update(self.interwiki_replacements) - return frozenmap(data) + return types.MappingProxyType(data) @obsolete.setter def obsolete(self, data): @@ -1190,7 +1190,7 @@ @classproperty def interwiki_replacements(cls): """Return an interwiki code replacement mapping.""" - return frozenmap(cls.code_aliases) + return types.MappingProxyType(cls.code_aliases) def shared_image_repository(self, code): """Return Wikimedia Commons as the shared image repository.""" diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 31c3196..f68af5d 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1930,3 +1930,7 @@ wrapper = ModuleDeprecationWrapper(__name__) wrapper._add_deprecated_attr('DotReadableDict', replacement_name='', since='20210416', future_warning=True) +wrapper._add_deprecated_attr('frozenmap', + replacement_name='types.MappingProxyType', + since='20210415', + future_warning=True) diff --git a/scripts/archivebot.py b/scripts/archivebot.py index e103d3d..d7a33f9 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -98,6 +98,7 @@ import os import re import time +import types from collections import defaultdict, OrderedDict from hashlib import md5 @@ -112,7 +113,7 @@ from pywikibot import i18n from pywikibot.textlib import (extract_sections, findmarker, TimeStripper, to_local_digits) -from pywikibot.tools import frozenmap, issue_deprecation_warning +from pywikibot.tools import issue_deprecation_warning ShouldArchive = Tuple[str, str] @@ -120,7 +121,7 @@ ZERO = datetime.timedelta(0) -MW_KEYS = frozenmap({ +MW_KEYS = types.MappingProxyType({ 's': 'seconds', 'h': 'hours', 'd': 'days', diff --git a/tests/family_tests.py b/tests/family_tests.py index bd60bab..765a84f 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -21,9 +21,6 @@ """Test cases for Family methods.""" - UNKNOWNFAMILY_RE = 'Family unknown does not exist' - FROZEN_TYPEERROR_RE = r"'frozen\w+' object does not support item " \ - 'assignment' net = False def test_family_load_valid(self): @@ -62,7 +59,7 @@ """Test that an invalid family raised UnknownFamily exception.""" with self.assertRaisesRegex( UnknownFamily, - self.UNKNOWNFAMILY_RE): + 'Family unknown does not exist'): Family.load('unknown') def test_new_same_family_singleton(self): @@ -99,7 +96,7 @@ other = 'unknown' with self.assertRaisesRegex( UnknownFamily, - self.UNKNOWNFAMILY_RE): + 'Family unknown does not exist'): family.__eq__(other) def test_get_obsolete_wp(self): @@ -132,17 +129,21 @@ """Test obsolete result not updatable.""" family = Family.load('wikipedia') with self.assertRaisesRegex( - AttributeError, - "'frozenmap' object has no attribute 'update'"): + AttributeError, + "'mappingproxy' object has no attribute 'update'"): family.obsolete.update({}) - with self.assertRaisesRegex(TypeError, self.FROZEN_TYPEERROR_RE): + with self.assertRaisesRegex( + TypeError, + "'mappingproxy' object does not support item assignment"): family.obsolete['a'] = 'b' def test_WikimediaFamily_obsolete_readonly(self): """Test WikimediaFamily obsolete is readonly.""" family = Family.load('wikipedia') - with self.assertRaisesRegex(TypeError, self.FROZEN_TYPEERROR_RE): + with self.assertRaisesRegex( + TypeError, + "'frozenset' object does not support item assignment"): family.obsolete = {'a': 'b', 'c': None} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680041 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: Ife5c3f09facbbdea67cb1fa0bd46d6af9e6b01b1 Gerrit-Change-Number: 680041 Gerrit-PatchSet: 3 Gerrit-Owner: Damian <atagar1(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

3 years, 1 month

[Gerrit] ...core[master]: [doc] Update ROADMAP.rst

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680313 ) Change subject: [doc] Update ROADMAP.rst ...................................................................... [doc] Update ROADMAP.rst Change-Id: I52784339752de243b64201b0ff34a0f10e2609fa --- M ROADMAP.rst 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index b47f76d..bf9edc7 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,6 +1,15 @@ Current release changes ~~~~~~~~~~~~~~~~~~~~~~~ +* **mwparserfromhell** or **wikitextparser** are strictly recommended (T106763) +* Enable different types with BaseBot.treat() +* Context manager depends on pymysql version, not Python release (T279753) +* Bugfix for Site.interwiki_prefix() (T188179) +* Deprecated MoveEntry.new_ns() and new_title() methods were removed +* Unused NoSuchSite and PageNotSaved exception were removed +* Unused BadTitle exception was removed (T267768) +* getSite() function was removed in favour of Site() constructor +* Page.fileUrl() was removed in favour of Page.get_file_url() * Require **Pillow**>=8.1.1 due to vulnerability found (T278743) * TkDialog of GUI userinterface requires **Python 3.6+** (T278743) * Enable textlib.extract_templates_and_params with **wikitextparser** package @@ -17,6 +26,9 @@ Future release notes ~~~~~~~~~~~~~~~~~~~~ +* 6.1.0: tools.DotReadableDict will be removed +* 6.1.0: mwparserfromhell or wikitextparser MediaWiki markup parser becomes mandatory (T106763) +* 6.1.0: textlib.unescape() function will be removed in favour of html.unescape() * 6.0.1: Site.undeletepage() and Site.undelete_file_versions() will be removed in favour of Site.undelete() method * 6.0.1: Site.deletepage() and Site.deleteoldimage() will be removed in favour of Site.delete() method * 6.0.1: DataSite.createNewItemFromPage() method will be removed in favour of ImagePage.fromPage() (T98663) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/680313 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: I52784339752de243b64201b0ff34a0f10e2609fa Gerrit-Change-Number: 680313 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2021