Pywikibot-commits January 2021

pywikibot-commits@lists.wikimedia.org

1 participants
131 discussions

[Gerrit] ...core[master]: [cleanup] use site._update_page with loadimageinfo method
by jenkins-bot (Code Review) 31 Jan '21

31 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/658043 ) Change subject: [cleanup] use site._update_page with loadimageinfo method ...................................................................... [cleanup] use site._update_page with loadimageinfo method - additional parameter verify_imageinfo in site._update_page will check 'imageinfo' content in every pageitem and probably raise an exception - call site._update_page with verify_imageinfo=True inside loadimageinfo and remove all other stuff for backward compatibility. loadimageinfo does not return a generator anymore. Change-Id: I9093ece5c55cd6217b40a71a68ebb5ba53a77806 --- M pywikibot/site/__init__.py 1 file changed, 19 insertions(+), 18 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 893218b..8d9a282 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -1177,13 +1177,30 @@ return self.namespaces[num] return self.namespaces[num][0] - def _update_page(self, page, query): + def _update_page(self, page, query, verify_imageinfo: bool = False): + """Update page attributes. + + @param page: page object to be updated + @param query: a api.QueryGenerator + @param verify_imageinfo: if given, every pageitem is checked + whether 'imageinfo' is missing. In that case an exception + is raised. + + @raises NoPage: 'missing' key is found in pageitem + @raises PageRelatedError: 'imageinfo' is missing in pageitem + """ for pageitem in query: if not self.sametitle(pageitem['title'], page.title(with_section=False)): raise InconsistentTitleReceived(page, pageitem['title']) api.update_page(page, pageitem, query.props) + if verify_imageinfo and 'imageinfo' not in pageitem: + if 'missing' in pageitem: + raise NoPage(page) + raise PageRelatedError( + page, 'loadimageinfo: Query on %s returned no imageinfo') + def loadpageinfo(self, page, preload=False): """Load page info from api and store in page attributes. @@ -1312,23 +1329,7 @@ 'url', 'size', 'sha1', 'mime', 'metadata', 'archivename'], **args) - # kept for backward compatibility - # TODO: when backward compatibility can be broken, adopt - # self._update_page() pattern and remove return - for pageitem in query: - if not self.sametitle(pageitem['title'], title): - raise InconsistentTitleReceived(page, pageitem['title']) - api.update_page(page, pageitem, query.props) - - if 'imageinfo' not in pageitem: - if 'missing' in pageitem: - raise NoPage(page) - raise PageRelatedError( - page, - 'loadimageinfo: Query on %s returned no imageinfo') - - return (pageitem['imageinfo'] - if history else pageitem['imageinfo'][0]) + self._update_page(page, query, verify_imageinfo=True) @deprecated('Check the content model instead', since='20150128', future_warning=True) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/658043 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: I9093ece5c55cd6217b40a71a68ebb5ba53a77806 Gerrit-Change-Number: 658043 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Revert "[cleanup] Deprecate loadimageinfo return statement"
by jenkins-bot (Code Review) 31 Jan '21

31 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/658042 ) Change subject: Revert "[cleanup] Deprecate loadimageinfo return statement" ...................................................................... Revert "[cleanup] Deprecate loadimageinfo return statement" Python 6.0.6 may be a breaking change and this new behaviour is already announced. The deprecation warning does not work for Python 3.5. This reverts commit 0010abde8dfd37cd8d2bdead4dffa072cf378f8f. Change-Id: Id629c8485631789ca5f931e00998e4094ef21508 --- M pywikibot/site/__init__.py M tests/site_tests.py 2 files changed, 1 insertion(+), 35 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 941fbd5..893218b 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -12,11 +12,9 @@ import datetime import functools import heapq -import inspect import itertools import json import mimetypes -import opcode import os import re import time @@ -1329,23 +1327,6 @@ page, 'loadimageinfo: Query on %s returned no imageinfo') - # inspect whether the result is assigned and print an deprecation - # warning in that case; implementation inspired by - # https://stackoverflow.com/questions/813882/is-there-a-way-to-check-whether-… - try: - frame = inspect.currentframe().f_back - next_opcode = opcode.opname[ - frame.f_code.co_code[frame.f_lasti + 3]] - if next_opcode in ('POP_TOP', 'ROT_TWO', 'ROT_THREE'): - issue_deprecation_warning( - 'APISite.loadimageinfo() result dict and any assignment', - "pageitem['imageinfo'] if history is True " - "else pageitem['imageinfo'][0]", - warning_class=FutureWarning, - since='20210110') - finally: - del frame - return (pageitem['imageinfo'] if history else pageitem['imageinfo'][0]) diff --git a/tests/site_tests.py b/tests/site_tests.py index b6b4d1a..1b37e0d 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -18,7 +18,7 @@ from pywikibot import config from pywikibot.data import api from pywikibot.exceptions import HiddenKeyError -from pywikibot.tools import PYTHON_VERSION, suppress_warnings +from pywikibot.tools import suppress_warnings from tests import patch, unittest_print from tests.aspects import ( @@ -33,7 +33,6 @@ WikidataTestCase, ) from tests.basepage import BasePageLoadRevisionsCachingTestBase -from tests.utils import expected_failure_if class TestSiteObjectDeprecatedFunctions(DefaultSiteTestCase, @@ -108,20 +107,6 @@ self.assertEqual(self.site.category_namespaces(), list(self.site.namespace(14, all=True))) - @expected_failure_if(PYTHON_VERSION < (3, 6)) - def test_loadimageinfo(self): - """Test deprecation warning if result of loadimageinfo() is used.""" - file = pywikibot.FilePage(self.site, 'foo.jpg') - if not file.file_is_shared(): - self.skipTest('test file is not shared from image repository.') - self.site.loadimageinfo(file) - self.assertNoDeprecation() - result = self.site.loadimageinfo(file) # noqa: F841 - self.assertOneDeprecation() - x = [] - x.append(self.site.loadimageinfo(file)) - self.assertOneDeprecation() - class TestSiteDryDeprecatedFunctions(DefaultDrySiteTestCase, DeprecationTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/658042 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: Id629c8485631789ca5f931e00998e4094ef21508 Gerrit-Change-Number: 658042 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [6.0] drop support for mw 1.19-1.22 in data/api.py
by jenkins-bot (Code Review) 31 Jan '21

31 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/657988 ) Change subject: [6.0] drop support for mw 1.19-1.22 in data/api.py ...................................................................... [6.0] drop support for mw 1.19-1.22 in data/api.py - also add typing hints - raise a TypeError if mime is given as boolean; this type is deprecated for 3 months - remove dry_api_tests.MimeTests because Request mime parameter's value is no longer changed but a TypeError is raised Bug: T268979 Change-Id: Ieecf9fda098ed30dff350a952149735575d9b1b1 --- M pywikibot/data/api.py M tests/dry_api_tests.py 2 files changed, 23 insertions(+), 69 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index bde7b4f..b12553e 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -37,11 +37,7 @@ ) from pywikibot.family import SubdomainFamily from pywikibot.login import LoginStatus -from pywikibot.tools import ( - issue_deprecation_warning, - itergroup, - PYTHON_VERSION, -) +from pywikibot.tools import itergroup, PYTHON_VERSION from pywikibot.tools.formatter import color_format @@ -973,8 +969,12 @@ # To make sure the default value of 'parameters' can be identified. _PARAM_DEFAULT = object() - def __init__(self, site=None, mime=None, throttle=True, - max_retries=None, retry_wait=None, use_get=None, + def __init__(self, site=None, + mime: Optional[dict] = None, + throttle: bool = True, + max_retries: Optional[int] = None, + retry_wait: Optional[int] = None, + use_get: Optional[bool] = None, parameters=_PARAM_DEFAULT, **kwargs): """ Create a new Request instance with the given parameters. @@ -1006,14 +1006,13 @@ None). Parameters which should only be transferred via mime mode are defined via this parameter (even an empty dict means mime shall be used). - @type mime: None or dict - @param max_retries: (optional) Maximum number of times to retry after + @param max_retries: Maximum number of times to retry after errors, defaults to config.max_retries. - @param retry_wait: (optional) Minimum time in seconds to wait after an + @param retry_wait: Minimum time in seconds to wait after an error, defaults to config.retry_wait seconds (doubles each retry until config.retry_max seconds is reached). - @param use_get: (optional) Use HTTP GET request if possible. If False - it uses a POST request. If None, it'll try to determine via + @param use_get: Use HTTP GET request if possible. If False it + uses a POST request. If None, it'll try to determine via action=paraminfo if the action requires a POST. @param parameters: The parameters used for the request to the API. @type parameters: dict @@ -1025,12 +1024,11 @@ .format(self.site), RuntimeWarning, 2) else: self.site = site + self.mime = mime - if isinstance(mime, bool): # type(mime) == bool is deprecated. - issue_deprecation_warning( - 'Bool values of mime param in api.Request()', - depth=3, warning_class=FutureWarning, since='20201028') - self.mime = {} if mime is True else None + if isinstance(mime, bool): + raise TypeError('mime param in api.Request() must not be boolean') + self.throttle = throttle self.use_get = use_get if max_retries is None: @@ -1100,21 +1098,10 @@ 'userinfo: {!r}'.format(username, self.site.userinfo)) # MediaWiki 1.23 allows assertion for any action, - # whereas earlier WMF wikis and others used an extension which - # could only allow assert for action=edit. - # - # When we can't easily check whether the extension is loaded, - # to avoid cyclic recursion in the Pywikibot codebase, assume - # that it is present, which will cause an API warning emitted - # to the logging (console) if it is not present, but will not - # otherwise be a problem. - # This situation is only tripped when one of the first actions - # on the site is a write action and the extension isn't installed. - if (self.write and self.site.mw_version >= '1.23' - or self.action == 'edit' - and self.site.has_extension('AssertEdit')): + # make sure user is logged in + if self.write: pywikibot.debug('Adding user assertion', _logger) - self['assert'] = 'user' # make sure user is logged in + self['assert'] = 'user' @classmethod def create_simple(cls, req_site, **kwargs): @@ -2247,14 +2234,10 @@ % self.__class__.__name__) parameters['indexpageids'] = True # always ask for list of pageids - if self.site.mw_version < '1.21': - self.continue_name = 'query-continue' - self.continue_update = self._query_continue - else: - self.continue_name = 'continue' - self.continue_update = self._continue - # Explicitly enable the simplified continuation - parameters['continue'] = True + self.continue_name = 'continue' + self.continue_update = self._continue + # Explicitly enable the simplified continuation + parameters['continue'] = True self.request = self.request_class(**kwargs) self.site._paraminfo.fetch('query+' + mod for mod in self.modules) @@ -3087,18 +3070,7 @@ def _update_revisions(page, revisions): """Update page revisions.""" - content_model = {'.js': 'javascript', '.css': 'css'} for rev in revisions: - if page.site.mw_version < '1.21': - # T102735: use content model depending on the page suffix - title = page.title(with_ns=False) - for suffix, cm in content_model.items(): - if title.endswith(suffix): - rev['contentmodel'] = cm - break - else: - rev['contentmodel'] = 'wikitext' - page._revisions[rev['revid']] = pywikibot.page.Revision(**rev) diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index bd88503..f64ff7b 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -1,6 +1,6 @@ """API tests which do not interact with a site.""" # -# (C) Pywikibot team, 2012-2020 +# (C) Pywikibot team, 2012-2021 # # Distributed under the terms of the MIT license. # @@ -303,24 +303,6 @@ self.assertNotEqual(body.find(file_content), -1) -class MimeTests(DefaultDrySiteTestCase): - - """Test MIME request handling with a real site.""" - - def test_upload_object(self): - """Test Request object prepared to upload.""" - # fake write test needs the config username - site = self.get_site() - site._username = 'myusername' - site._userinfo = {'name': 'myusername', 'groups': [], 'id': '1'} - parameters = {'action': 'upload', 'file': 'MP_sounds.png', - 'filename': join_images_path('MP_sounds.png')} - req = Request(site=site, mime=True, parameters=parameters) - with self.assertRaises(AssertionError): - assert req.mime is True - self.assertEqual(req.mime, {}) - - class ParamInfoDictTests(DefaultDrySiteTestCase): """Test extracting data from the ParamInfo.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/657988 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: Ieecf9fda098ed30dff350a952149735575d9b1b1 Gerrit-Change-Number: 657988 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: DannyS712 <DannyS712.enwiki(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [6.0] drop support for mw 1.19-1.22 in pywikibot.page
by jenkins-bot (Code Review) 31 Jan '21

31 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/657989 ) Change subject: [6.0] drop support for mw 1.19-1.22 in pywikibot.page ...................................................................... [6.0] drop support for mw 1.19-1.22 in pywikibot.page Bug: T268979 Change-Id: I52c253f1cede0299e772c3e79ea8e329a11bcf2d --- M pywikibot/page/__init__.py M pywikibot/page/_revision.py 2 files changed, 1 insertion(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index a803780..70b165d 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -44,7 +44,7 @@ ) from pywikibot.family import Family from pywikibot.page._revision import Revision -from pywikibot.site import DataSite, Namespace, need_version +from pywikibot.site import DataSite, Namespace from pywikibot.tools import ( add_full_name, compute_file_hash, @@ -257,7 +257,6 @@ If it cannot be reliably determined via the API, None is returned. """ - # TODO: T102735: Add a sane default of 'wikitext' and others for <1.21 if not hasattr(self, '_contentmodel'): self.site.loadpageinfo(self) return self._contentmodel @@ -1576,7 +1575,6 @@ return None return list(self._coords) - @need_version('1.20') def page_image(self): """ Return the most appropriate image on the page. diff --git a/pywikibot/page/_revision.py b/pywikibot/page/_revision.py index 46913f5..32436b2 100644 --- a/pywikibot/page/_revision.py +++ b/pywikibot/page/_revision.py @@ -122,7 +122,5 @@ this returns the content model of the main slot. @return: content model - @raises AssertionError: content model not supplied to the constructor - which always occurs for MediaWiki versions lower than 1.21. """ return self.contentmodel -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/657989 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: I52c253f1cede0299e772c3e79ea8e329a11bcf2d Gerrit-Change-Number: 657989 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] use userinfo deleter to delete APISite._userinfo
by jenkins-bot (Code Review) 31 Jan '21

31 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/660423 ) Change subject: [IMPR] use userinfo deleter to delete APISite._userinfo ...................................................................... [IMPR] use userinfo deleter to delete APISite._userinfo Change-Id: Ibc9c629096caba03884828e99fd7d1155af5c3e9 --- M pywikibot/site/__init__.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 98b12a7..cd77fdc 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -399,7 +399,7 @@ the internal login state does not match the state we receive from the site. """ - del self._userinfo + del self.userinfo self._loginstatus = _LoginStatus.NOT_LOGGED_IN self.login() @@ -423,7 +423,7 @@ self._loginstatus = _LoginStatus.NOT_LOGGED_IN # Reset tokens and user properties - del self._userinfo + del self.userinfo self.tokens = TokenWallet(self) self._paraminfo = api.ParamInfo(self) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/660423 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: Ibc9c629096caba03884828e99fd7d1155af5c3e9 Gerrit-Change-Number: 660423 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]: [cleanup] Remove DataSite get_* methods deprecated for 6 years
by jenkins-bot (Code Review) 31 Jan '21

31 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/659769 ) Change subject: [cleanup] Remove DataSite get_* methods deprecated for 6 years ...................................................................... [cleanup] Remove DataSite get_* methods deprecated for 6 years Change-Id: I44d9a7efd8f3fcae0807a23079b2db4cd713eeaf --- M pywikibot/site/__init__.py M tests/wikibase_tests.py 2 files changed, 0 insertions(+), 137 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/site/__init__.py b/pywikibot/site/__init__.py index 98b12a7..60d563c 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -10,7 +10,6 @@ # Distributed under the terms of the MIT license. # import datetime -import functools import heapq import inspect import itertools @@ -5942,92 +5941,6 @@ return baserevid - def __getattr__(self, attr): - """ - Provide data access methods. - - Methods provided are get_info, get_sitelinks, get_aliases, - get_labels, get_descriptions, and get_urls. - """ - if hasattr(self.__class__, attr): - return getattr(self.__class__, attr) - if attr.startswith('get_'): - props = attr.replace('get_', '') - if props in ['info', 'sitelinks', 'aliases', 'labels', - 'descriptions', 'urls']: - if props == 'info': - instead = ( - '\n' - "{'lastrevid': ItemPage.latest_revision_id,\n" - " 'pageid': ItemPage.pageid,\n" - " 'title': ItemPage.title(),\n" - " 'modified': ItemPage._timestamp,\n" - " 'ns': ItemPage.namespace(),\n" - " 'type': ItemPage.entity_type, # for subclasses\n" - " 'id': ItemPage.id" - '}\n') - elif props == 'sitelinks': - instead = 'ItemPage.sitelinks' - elif props in ('aliases', 'labels', 'descriptions'): - instead = ('ItemPage.{0} after ItemPage.get()' - .format(attr)) - else: # urls - instead = None - issue_deprecation_warning('DataSite.{0}()'.format(attr), - instead, warning_class=FutureWarning, - since='20151022') - if props == 'urls': - props = 'sitelinks/urls' - method = self._get_propertyitem - f = functools.partial(method, props) - if hasattr(method, '__doc__'): - f.__doc__ = method.__doc__ - return f - - return super().__getattr__(attr) - - def _get_propertyitem(self, props, source, **params): - """Generic method to get the data for multiple Wikibase items.""" - wbdata = self._get_item(source, props=props, **params) - if props == 'info': - return wbdata - - if props == 'sitelinks/urls': - props = 'sitelinks' - - assert props in wbdata, \ - 'API wbgetentities response lacks %s key' % props - return wbdata[props] - - # Only separated from get_item to avoid the deprecation message via - # _get_propertyitem - def _get_item(self, source, **params): - assert set(params) <= {'props'}, \ - 'Only "props" is a valid kwarg, not {0}'.format(set(params) - - {'props'}) - try: - source = int(source) - except ValueError: - raise NotImplementedError - ids = 'q' + str(source) - params = merge_unique_dicts(params, action='wbgetentities', - ids=ids) - wbrequest = self._simple_request(**params) - wbdata = wbrequest.submit() - assert 'success' in wbdata, \ - "API wbgetentities response lacks 'success' key" - assert wbdata['success'] == 1, "API 'success' key is not 1" - assert 'entities' in wbdata, \ - "API wbgetentities response lacks 'entities' key" - - if ids.upper() in wbdata['entities']: - ids = ids.upper() - - assert ids in wbdata['entities'], \ - 'API wbgetentities response lacks %s key' % ids - - return wbdata['entities'][ids] - def data_repository(self): """ Override parent method. diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 7cff163..f77af864 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -2428,56 +2428,6 @@ self.assertEqual(diff, expected) -class TestDeprecatedDataSiteMethods(WikidataTestCase, DeprecationTestCase): - - """Test deprecated DataSite get_* methods.""" - - cached = True - - def test_get_info(self): - """Test get_info.""" - data = self.repo.get_info(60) - self.assertOneDeprecation() - self.assertIsInstance(data, dict) - self.assertIn('title', data) - self.assertEqual(data['title'], 'Q60') - - def test_get_labels(self): - """Test get_labels.""" - data = self.repo.get_labels(60) - self.assertOneDeprecation() - self.assertIsInstance(data, dict) - self.assertIn('en', data) - - def test_get_aliases(self): - """Test get_aliases.""" - data = self.repo.get_aliases(60) - self.assertOneDeprecation() - self.assertIsInstance(data, dict) - self.assertIn('fr', data) # T170073 - - def test_get_descriptions(self): - """Test get_descriptions.""" - data = self.repo.get_descriptions(60) - self.assertOneDeprecation() - self.assertIsInstance(data, dict) - self.assertIn('en', data) - - def test_get_sitelinks(self): - """Test get_sitelinks.""" - data = self.repo.get_sitelinks(60) - self.assertOneDeprecation() - self.assertIsInstance(data, dict) - self.assertIn('enwiki', data) - - def test_get_urls(self): - """Test get_urls.""" - data = self.repo.get_urls(60) - self.assertOneDeprecation() - self.assertIsInstance(data, dict) - self.assertIn('enwiki', data) - - if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/659769 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: I44d9a7efd8f3fcae0807a23079b2db4cd713eeaf Gerrit-Change-Number: 659769 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] remove deprecated logtypes classproperty
by jenkins-bot (Code Review) 31 Jan '21

31 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/658078 ) Change subject: [cleanup] remove deprecated logtypes classproperty ...................................................................... [cleanup] remove deprecated logtypes classproperty This also removes warnings in tox-doc-docker Change-Id: Ib89bfe2433df984e17bedad4beda767c2f910d95 --- M pywikibot/logentries.py 1 file changed, 2 insertions(+), 9 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/logentries.py b/pywikibot/logentries.py index bee3ae5..68d9708 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -1,6 +1,6 @@ """Objects representing Mediawiki log entries.""" # -# (C) Pywikibot team, 2007-2020 +# (C) Pywikibot team, 2007-2021 # # Distributed under the terms of the MIT license. # @@ -11,7 +11,7 @@ from pywikibot.backports import List from pywikibot.exceptions import Error, HiddenKeyError -from pywikibot.tools import classproperty, deprecated +from pywikibot.tools import deprecated _logger = 'wiki' @@ -397,13 +397,6 @@ logclass = self.get_valid_entry_class(logtype) self._creator = lambda data: logclass(data, self._site) - @classproperty - @deprecated('Site.logtypes or LogEntryFactory.get_entry_class(logtype)', - since='20160918', future_warning=True) - def logtypes(cls): - """DEPRECATED LogEntryFactory class attribute of log types.""" - return cls._logtypes - def create(self, logdata): """ Instantiate the LogEntry object representing logdata. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/658078 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: Ib89bfe2433df984e17bedad4beda767c2f910d95 Gerrit-Change-Number: 658078 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Adopted context manager calls for assertRaises/assertRaisesRegex
by jenkins-bot (Code Review) 30 Jan '21

30 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/659857 ) Change subject: Adopted context manager calls for assertRaises/assertRaisesRegex ...................................................................... Adopted context manager calls for assertRaises/assertRaisesRegex Bug: T267801 Change-Id: I96dd3b0c6a8e13fe74715e7d7c98a27a095009b6 --- M tests/family_tests.py M tests/flow_edit_tests.py M tests/flow_tests.py M tests/http_tests.py M tests/i18n_tests.py M tests/interwiki_link_tests.py M tests/interwikidata_tests.py M tests/isbn_tests.py M tests/link_tests.py M tests/logentries_tests.py M tests/login_tests.py 11 files changed, 170 insertions(+), 135 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/family_tests.py b/tests/family_tests.py index 203efb7..7d3dcd7 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -1,6 +1,6 @@ """Tests for the family module.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # @@ -60,11 +60,10 @@ def test_family_load_invalid(self): """Test that an invalid family raised UnknownFamily exception.""" - self.assertRaisesRegex( - UnknownFamily, - self.UNKNOWNFAMILY_RE, - Family.load, - 'unknown') + with self.assertRaisesRegex( + UnknownFamily, + self.UNKNOWNFAMILY_RE): + Family.load('unknown') def test_new_same_family_singleton(self): """Test that two same Family are the same object and equal.""" @@ -98,11 +97,10 @@ """Test that Family and string with different name are not equal.""" family = Family.load('wikipedia') other = 'unknown' - self.assertRaisesRegex( - UnknownFamily, - self.UNKNOWNFAMILY_RE, - family.__eq__, - other) + with self.assertRaisesRegex( + UnknownFamily, + self.UNKNOWNFAMILY_RE): + family.__eq__(other) def test_get_obsolete_wp(self): """Test three types of obsolete codes.""" @@ -197,11 +195,11 @@ self.assertEqual(f.from_url(prefix + '/w/index.php?title=Foo'), 'vo') # Text after $1 is not allowed - self.assertRaisesRegex( - ValueError, - r'Text after the \$1 placeholder is not supported $T111513$', - f.from_url, - '//vo.wikipedia.org/wiki/$1/foo') + with self.assertRaisesRegex( + ValueError, + r'Text after the \$1 placeholder is not supported' + r' $T111513$'): + f.from_url('//vo.wikipedia.org/wiki/$1/foo') # the IWM may contain the wrong protocol, but it's only used to # determine a site so using HTTP or HTTPS is not an issue diff --git a/tests/flow_edit_tests.py b/tests/flow_edit_tests.py index afc31e3..d6120d3 100644 --- a/tests/flow_edit_tests.py +++ b/tests/flow_edit_tests.py @@ -198,11 +198,14 @@ content = 'I am a reply to a locked topic. This is not good!' topic = Topic(self.site, 'Topic:Smxnipjfs8umm1wt') # Reply (should raise a LockedPage exception) - self.assertRaises(LockedPage, topic.reply, content, 'wikitext') + with self.assertRaises(LockedPage): + topic.reply(content, 'wikitext') topic_root = topic.root - self.assertRaises(LockedPage, topic_root.reply, content, 'wikitext') + with self.assertRaises(LockedPage): + topic_root.reply(content, 'wikitext') topic_reply = topic.root.replies(force=True)[0] - self.assertRaises(LockedPage, topic_reply.reply, content, 'wikitext') + with self.assertRaises(LockedPage): + topic_reply.reply(content, 'wikitext') class FlowTests(TestCase): diff --git a/tests/flow_tests.py b/tests/flow_tests.py index 8b084b3..5b8fed6 100644 --- a/tests/flow_tests.py +++ b/tests/flow_tests.py @@ -165,19 +165,26 @@ real_topic = Topic(self.site, 'Topic:Slbktgav46omarsd') fake_topic = Topic(self.site, 'Topic:Abcdefgh12345678') # Topic.from_topiclist_data - self.assertRaises(TypeError, Topic.from_topiclist_data, self.site, - '', {}) - self.assertRaises(TypeError, Topic.from_topiclist_data, board, 521, {}) - self.assertRaises(TypeError, Topic.from_topiclist_data, board, - 'slbktgav46omarsd', [0, 1, 2]) - self.assertRaises(NoPage, Topic.from_topiclist_data, board, - 'abc', {'stuff': 'blah'}) + with self.assertRaises(TypeError): + Topic.from_topiclist_data(self.site, '', {}) + with self.assertRaises(TypeError): + Topic.from_topiclist_data(board, 521, {}) + with self.assertRaises(TypeError): + Topic.from_topiclist_data(board, + 'slbktgav46omarsd', [0, 1, 2]) + with self.assertRaises(NoPage): + Topic.from_topiclist_data(board, + 'abc', {'stuff': 'blah'}) # Post.fromJSON - self.assertRaises(TypeError, Post.fromJSON, board, 'abc', {}) - self.assertRaises(TypeError, Post.fromJSON, real_topic, 1234, {}) - self.assertRaises(TypeError, Post.fromJSON, real_topic, 'abc', []) - self.assertRaises(NoPage, Post.fromJSON, fake_topic, 'abc', + with self.assertRaises(TypeError): + Post.fromJSON(board, 'abc', {}) + with self.assertRaises(TypeError): + Post.fromJSON(real_topic, 1234, {}) + with self.assertRaises(TypeError): + Post.fromJSON(real_topic, 'abc', []) + with self.assertRaises(NoPage): + Post.fromJSON(fake_topic, 'abc', {'posts': [], 'revisions': []}) def test_invalid_data(self): @@ -185,28 +192,36 @@ board = Board(self.site, 'Talk:Pywikibot test') real_topic = Topic(self.site, 'Topic:Slbktgav46omarsd') # Topic.from_topiclist_data - self.assertRaises(ValueError, Topic.from_topiclist_data, - board, 'slbktgav46omarsd', {'stuff': 'blah'}) - self.assertRaises(ValueError, Topic.from_topiclist_data, - board, 'slbktgav46omarsd', - {'posts': [], 'revisions': []}) - self.assertRaises(ValueError, Topic.from_topiclist_data, board, - 'slbktgav46omarsd', - {'posts': {'slbktgav46omarsd': ['123']}, - 'revisions': {'456': []}}) - self.assertRaises(AssertionError, Topic.from_topiclist_data, board, - 'slbktgav46omarsd', - {'posts': {'slbktgav46omarsd': ['123']}, - 'revisions': {'123': {'content': 789}}}) + with self.assertRaises(ValueError): + Topic.from_topiclist_data(board, + 'slbktgav46omarsd', {'stuff': 'blah'}) + with self.assertRaises(ValueError): + Topic.from_topiclist_data(board, + 'slbktgav46omarsd', + {'posts': [], 'revisions': []}) + with self.assertRaises(ValueError): + Topic.from_topiclist_data(board, + 'slbktgav46omarsd', + {'posts': {'slbktgav46omarsd': ['123']}, + 'revisions': {'456': []}}) + with self.assertRaises(AssertionError): + Topic.from_topiclist_data(board, + 'slbktgav46omarsd', + {'posts': {'slbktgav46omarsd': ['123']}, + 'revisions': {'123': {'content': 789}}}) # Post.fromJSON - self.assertRaises(ValueError, Post.fromJSON, real_topic, 'abc', {}) - self.assertRaises(ValueError, Post.fromJSON, real_topic, 'abc', + with self.assertRaises(ValueError): + Post.fromJSON(real_topic, 'abc', {}) + with self.assertRaises(ValueError): + Post.fromJSON(real_topic, 'abc', {'stuff': 'blah'}) - self.assertRaises(ValueError, Post.fromJSON, real_topic, 'abc', + with self.assertRaises(ValueError): + Post.fromJSON(real_topic, 'abc', {'posts': {'abc': ['123']}, 'revisions': {'456': []}}) - self.assertRaises(AssertionError, Post.fromJSON, real_topic, 'abc', + with self.assertRaises(AssertionError): + Post.fromJSON(real_topic, 'abc', {'posts': {'abc': ['123']}, 'revisions': {'123': {'content': 789}}}) diff --git a/tests/http_tests.py b/tests/http_tests.py index e8f8dcd..c0a4d63 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -1,6 +1,6 @@ """Tests for http module.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # @@ -97,9 +97,10 @@ def test_https_cert_error(self): """Test if http.fetch respects disable_ssl_certificate_validation.""" - self.assertRaisesRegex( - pywikibot.FatalServerError, self.CERT_VERIFY_FAILED_RE, http.fetch, - 'https://testssl-expire-r2i2.disig.sk/index.en.html') + with self.assertRaisesRegex( + pywikibot.FatalServerError, + self.CERT_VERIFY_FAILED_RE): + http.fetch('https://testssl-expire-r2i2.disig.sk/index.en.html') http.session.close() # clear the connection with warnings.catch_warnings(record=True) as warning_log: @@ -111,9 +112,10 @@ http.session.close() # clear the connection # Verify that it now fails again - self.assertRaisesRegex( - pywikibot.FatalServerError, self.CERT_VERIFY_FAILED_RE, http.fetch, - 'https://testssl-expire-r2i2.disig.sk/index.en.html') + with self.assertRaisesRegex( + pywikibot.FatalServerError, + self.CERT_VERIFY_FAILED_RE): + http.fetch('https://testssl-expire-r2i2.disig.sk/index.en.html') http.session.close() # clear the connection # Verify that the warning occurred @@ -139,26 +141,27 @@ def test_http_504(self): """Test that a HTTP 504 raises the correct exception.""" - self.assertRaisesRegex(pywikibot.Server504Error, - r'Server ([^\:]+|[^\:]+:[0-9]+) timed out', - http.fetch, - self.get_httpbin_url('/status/504')) + with self.assertRaisesRegex( + pywikibot.Server504Error, + r'Server ([^\:]+|[^\:]+:[0-9]+)' + r' timed out'): + http.fetch(self.get_httpbin_url('/status/504')) def test_server_not_found(self): """Test server not found exception.""" - self.assertRaisesRegex(requests.exceptions.ConnectionError, - 'Max retries exceeded with url: /w/api.php', - http.fetch, - 'http://ru-sib.wikipedia.org/w/api.php', - default_error_handling=True) + with self.assertRaisesRegex( + requests.exceptions.ConnectionError, + 'Max retries exceeded with url: /w/api.php'): + http.fetch('http://ru-sib.wikipedia.org/w/api.php', + default_error_handling=True) def test_invalid_scheme(self): """Test invalid scheme.""" # A InvalidSchema is raised within requests - self.assertRaisesRegex( - requests.exceptions.InvalidSchema, - "No connection adapters were found for u?'invalid://url'", - http.fetch, 'invalid://url') + with self.assertRaisesRegex( + requests.exceptions.InvalidSchema, + "No connection adapters were found for u?'invalid://url'"): + http.fetch('invalid://url') def test_follow_redirects(self): """Test follow 301 redirects correctly.""" @@ -294,16 +297,18 @@ self.assertEqual(r.request.headers['user-agent'], 'ARBITRARY') # Empty value - self.assertRaisesRegex(ValueError, - 'Invalid parameter: use_fake_user_agent', - http.fetch, self.get_httpbin_url('/status/200'), - use_fake_user_agent='') + with self.assertRaisesRegex( + ValueError, + 'Invalid parameter: use_fake_user_agent'): + http.fetch(self.get_httpbin_url('/status/200'), + use_fake_user_agent='') # Parameter wrongly set to None - self.assertRaisesRegex(ValueError, - 'Invalid parameter: use_fake_user_agent', - http.fetch, self.get_httpbin_url('/status/200'), - use_fake_user_agent=None) + with self.assertRaisesRegex( + ValueError, + 'Invalid parameter: use_fake_user_agent'): + http.fetch(self.get_httpbin_url('/status/200'), + use_fake_user_agent=None) # Manually overridden domains config.fake_user_agent_exceptions = { @@ -503,9 +508,10 @@ data=CharsetTestCase.LATIN1_BYTES) # Ignore WARNING: Encoding "utf16" requested but "utf-8" received with patch('pywikibot.warning'): - self.assertRaisesRegex( - UnicodeDecodeError, self.CODEC_CANT_DECODE_RE, - http._decide_encoding, resp, charset) + with self.assertRaisesRegex( + UnicodeDecodeError, + self.CODEC_CANT_DECODE_RE): + http._decide_encoding(resp, charset) self.assertEqual(resp.content, CharsetTestCase.LATIN1_BYTES) try: @@ -514,9 +520,10 @@ resp.encoding = e with patch('pywikibot.error'): - self.assertRaisesRegex( - UnicodeDecodeError, self.CODEC_CANT_DECODE_RE, - http.error_handling_callback, resp) + with self.assertRaisesRegex( + UnicodeDecodeError, + self.CODEC_CANT_DECODE_RE): + http.error_handling_callback(resp) # TODO: this is a breaking change # self.assertRaisesRegex( diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index a0308de..4d31881 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -1,6 +1,6 @@ """Test i18n module.""" # -# (C) Pywikibot team, 2007-2020 +# (C) Pywikibot team, 2007-2021 # # Distributed under the terms of the MIT license. # @@ -295,8 +295,8 @@ def testNoEnglish(self): """Test translating into English with missing entry.""" - self.assertRaises(i18n.TranslationError, i18n.twtranslate, - 'en', 'test-no-english') + with self.assertRaises(i18n.TranslationError): + i18n.twtranslate('en', 'test-no-english') class TestTWNTranslate(TWNTestCaseBase, AutoDeprecationTestCase): @@ -466,8 +466,8 @@ def test_missing(self): """Test a missing message from a real message bundle.""" - self.assertRaises(i18n.TranslationError, - i18n.twntranslate, 'en', 'pywikibot-missing-key') + with self.assertRaises(i18n.TranslationError): + i18n.twntranslate('en', 'pywikibot-missing-key') class InputTestCase(TWNTestCaseBase, UserInterfaceLangTestCase, PwbTestCase): diff --git a/tests/interwiki_link_tests.py b/tests/interwiki_link_tests.py index 774f7e6..45be024 100644 --- a/tests/interwiki_link_tests.py +++ b/tests/interwiki_link_tests.py @@ -1,6 +1,6 @@ """Test Interwiki Link functionality.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # @@ -81,11 +81,12 @@ def test_via_local_non_local(self): """Test de:translatewiki:Main Page on English Wikipedia.""" link = Link('de:translatewiki:Main Page', self.get_site('wp')) - self.assertRaisesRegex( - InvalidTitle, - 'de:translatewiki:Main Page links to a non local site i18n:i18n ' - 'via an interwiki link to wikipedia:de', - link.parse) + with self.assertRaisesRegex( + InvalidTitle, + 'de:translatewiki:Main Page links to a non local ' + 'site i18n:i18n ' + 'via an interwiki link to wikipedia:de'): + link.parse() if __name__ == '__main__': # pragma: no cover diff --git a/tests/interwikidata_tests.py b/tests/interwikidata_tests.py index 2c9a932..ea7de14 100644 --- a/tests/interwikidata_tests.py +++ b/tests/interwikidata_tests.py @@ -1,6 +1,6 @@ """Tests for scripts/interwikidata.py.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # @@ -90,17 +90,17 @@ def test_without_repo(self): """Test throwing error when site does not have a data repo.""" wt_page = pywikibot.Page(self.wt, 'User:Ladsgroup') - self.assertRaises(ValueError, DummyBot, generator=[wt_page], - site=self.wt) + with self.assertRaises(ValueError): + DummyBot(generator=[wt_page], + site=self.wt) - self.assertRaisesRegex( - ValueError, - r'wikitech:en does not have a data repository, ' - r'use interwiki\.py instead.', - interwikidata.IWBot, - generator=[pywikibot.Page(self.wt, 'User:Dalba')], - site=self.wt, - ) + with self.assertRaisesRegex( + ValueError, + r'wikitech:en does not have a data repository, ' + r'use interwiki\.py instead.'): + interwikidata.IWBot( + generator=[pywikibot.Page(self.wt, 'User:Dalba')], + site=self.wt) if __name__ == '__main__': # pragma: no cover diff --git a/tests/isbn_tests.py b/tests/isbn_tests.py index 46c0cb6..fde5053 100644 --- a/tests/isbn_tests.py +++ b/tests/isbn_tests.py @@ -1,6 +1,6 @@ """Tests for isbn script.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # @@ -66,30 +66,34 @@ cc = CosmeticChangesToolkit(self.site, namespace=0) # Invalid characters - self.assertRaisesRegex(AnyIsbnValidationException, - '|'.join((self.ISBN_DIGITERROR_RE, - self.ISBN_INVALIDERROR_RE, - self.ISBN_INVALIDLENGTHERROR_RE)), - cc.fix_ISBN, 'ISBN 0975229LOL') + with self.assertRaisesRegex( + AnyIsbnValidationException, + '|'.join((self.ISBN_DIGITERROR_RE, + self.ISBN_INVALIDERROR_RE, + self.ISBN_INVALIDLENGTHERROR_RE))): + cc.fix_ISBN('ISBN 0975229LOL') # Invalid checksum - self.assertRaisesRegex(AnyIsbnValidationException, - '|'.join((self.ISBN_CHECKSUMERROR_RE, - self.ISBN_INVALIDERROR_RE, - self.ISBN_INVALIDLENGTHERROR_RE, - self.ISBN_INVALIDCHECKERROR_RE)), - cc.fix_ISBN, 'ISBN 0975229801') + with self.assertRaisesRegex( + AnyIsbnValidationException, + '|'.join((self.ISBN_CHECKSUMERROR_RE, + self.ISBN_INVALIDERROR_RE, + self.ISBN_INVALIDLENGTHERROR_RE, + self.ISBN_INVALIDCHECKERROR_RE))): + cc.fix_ISBN('ISBN 0975229801') # Invalid length - self.assertRaisesRegex(AnyIsbnValidationException, - '|'.join((self.ISBN_DIGITERROR_RE, - self.ISBN_INVALIDERROR_RE, - self.ISBN_INVALIDLENGTHERROR_RE)), - cc.fix_ISBN, 'ISBN 09752298') + with self.assertRaisesRegex( + AnyIsbnValidationException, + '|'.join((self.ISBN_DIGITERROR_RE, + self.ISBN_INVALIDERROR_RE, + self.ISBN_INVALIDLENGTHERROR_RE))): + cc.fix_ISBN('ISBN 09752298') # X in the middle - self.assertRaisesRegex(AnyIsbnValidationException, - '|'.join((self.ISBN_INVALIDCHARERROR_RE, - self.ISBN_INVALIDERROR_RE, - self.ISBN_INVALIDLENGTHERROR_RE)), - cc.fix_ISBN, 'ISBN 09752X9801') + with self.assertRaisesRegex( + AnyIsbnValidationException, + '|'.join((self.ISBN_INVALIDCHARERROR_RE, + self.ISBN_INVALIDERROR_RE, + self.ISBN_INVALIDLENGTHERROR_RE))): + cc.fix_ISBN('ISBN 09752X9801') def test_ignore_invalid_isbn(self): """Test fixing ISBN numbers with an invalid ISBN.""" diff --git a/tests/link_tests.py b/tests/link_tests.py index a84a330..3f17b1f5 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -942,15 +942,18 @@ def test_interwiki_namespace_without_title(self): """Test that Link doesn't allow links without a title.""" link = Link('en:Help:', self.get_site()) - self.assertRaisesRegex( - InvalidTitle, "'en:Help:' has no title.", link.parse) + with self.assertRaisesRegex( + InvalidTitle, + "'en:Help:' has no title."): + link.parse() def test_no_text(self): """Test that Link doesn't allow empty.""" link = Link('', self.get_site()) - self.assertRaisesRegex( - InvalidTitle, 'The link does not contain a page title', - link.parse) + with self.assertRaisesRegex( + InvalidTitle, + 'The link does not contain a page title'): + link.parse() def test_namespace_lookalike(self): """Test that Link does only detect valid namespaces.""" diff --git a/tests/logentries_tests.py b/tests/logentries_tests.py index b4bae4e..7201956 100644 --- a/tests/logentries_tests.py +++ b/tests/logentries_tests.py @@ -122,7 +122,8 @@ else: self.assertIsInstance(logentry.page(), pywikibot.Page) else: - self.assertRaises(KeyError, logentry.page) + with self.assertRaises(KeyError): + logentry.page() self.assertEqual(logentry.type(), logtype) self.assertIsInstance(logentry.user(), str) @@ -312,7 +313,8 @@ self.assertIsInstance(logentry.title(), pywikibot.Page) self.assertIs(logentry.title(), logentry.page()) else: - self.assertRaises(KeyError, logentry.title) + with self.assertRaises(KeyError): + logentry.title() self.assertDeprecation() # T271044 self._reset_messages() # T271044 diff --git a/tests/login_tests.py b/tests/login_tests.py index d0693ac..40bc70a 100644 --- a/tests/login_tests.py +++ b/tests/login_tests.py @@ -4,7 +4,7 @@ e.g. used to test password-file based login. """ # -# (C) Pywikibot team, 2012-2020 +# (C) Pywikibot team, 2012-2021 # # Distributed under the terms of the MIT license. # @@ -72,8 +72,10 @@ del FakeConfig.usernames['*'] FakeConfig.usernames['*']['en'] = FakeUsername error_undefined_username = 'ERROR: username for.*is undefined.\nIf' - self.assertRaisesRegex(NoUsername, error_undefined_username, - LoginManager) + with self.assertRaisesRegex( + NoUsername, + error_undefined_username): + LoginManager() FakeConfig.usernames['*']['*'] = FakeUsername lm = LoginManager() self.assertEqual(lm.username, FakeUsername) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/659857 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: I96dd3b0c6a8e13fe74715e7d7c98a27a095009b6 Gerrit-Change-Number: 659857 Gerrit-PatchSet: 3 Gerrit-Owner: Homeboy 445 <akshitsan13(a)gmail.com> Gerrit-Reviewer: Isaacandy <isaac(a)iznd.xyz> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Update ROADMAP.rst
by jenkins-bot (Code Review) 29 Jan '21

29 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/659819 ) Change subject: [doc] Update ROADMAP.rst ...................................................................... [doc] Update ROADMAP.rst Change-Id: I6f02b2eadefe06d8f4e19c7b6d90ef2ea09e8a55 --- M ROADMAP.rst 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 69a9836..d2b9666 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,18 +4,20 @@ Breaking changes ^^^^^^^^^^^^^^^^ +* Return requests.Response with http.request() instead of plain text (T265206) * config.db_hostname has been renamed to db_hostname_format Other changes ^^^^^^^^^^^^^ -* (no changes yet) +* Add enabled_options, disabled_options to GeneratorFactory (T271320) +* Move interwiki() interwiki_prefix() and local_interwiki() methods from BaseSite to APISite +* Add requests.Response.headers to log when an API error occurs (T272325) +* Unused comms.threadedhttp module was removed; threadedhttp.HttpRequest was already replaced with requests.Response (T265206) Future release notes ~~~~~~~~~~~~~~~~~~~~ -* 5.6.0: comms.http.request() will return a requests.Response object rather than plain text (T265206) -* 5.6.0: comms.threadedhttp module will be removed (T265206) * 5.6.0: APISite.loadimageinfo will no longer return any content * 5.6.0: pagenenerators.handleArg() method will be removed in favour of handle_arg() (T271437) * 5.5.0: Deprecated data attribute of http.fetch() result will be given up (T265206) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/659819 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: I6f02b2eadefe06d8f4e19c7b6d90ef2ea09e8a55 Gerrit-Change-Number: 659819 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] Remove deprecated "gen" parameter of NoReferencesBot
by jenkins-bot (Code Review) 29 Jan '21

29 Jan '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/659808 ) Change subject: [tests] Remove deprecated "gen" parameter of NoReferencesBot ...................................................................... [tests] Remove deprecated "gen" parameter of NoReferencesBot Change-Id: I8140117cfc2278cfec751164a6d1d8f12bcaef84 --- M tests/noreferences_tests.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/noreferences_tests.py b/tests/noreferences_tests.py index d2d39bc..390688c 100644 --- a/tests/noreferences_tests.py +++ b/tests/noreferences_tests.py @@ -1,6 +1,6 @@ """Test noreferences bot module.""" # -# (C) Pywikibot team, 2018-2020 +# (C) Pywikibot team, 2018-2021 # # Distributed under the terms of the MIT license. # @@ -20,7 +20,7 @@ def test_add(self): """Test adding references section.""" page = pywikibot.Page(self.site, 'foo') - bot = NoReferencesBot(None) + bot = NoReferencesBot() bot.site = self.site page.text = '\n== Reference ==\n* [http://www.baz.org Baz]' new_text = bot.addReferences(page.text) @@ -31,7 +31,7 @@ def test_add_under_templates(self): """Test adding references section under templates in section.""" page = pywikibot.Page(self.site, 'foo') - bot = NoReferencesBot(None) + bot = NoReferencesBot() bot.site = self.site page.text = '\n== Reference ==\n{{Překlad|en|Baz|123456}}' new_text = bot.addReferences(page.text) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/659808 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: I8140117cfc2278cfec751164a6d1d8f12bcaef84 Gerrit-Change-Number: 659808 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2021