Pywikibot-commits July 2020

pywikibot-commits@lists.wikimedia.org

1 participants
180 discussions

[Gerrit] ...core[master]: [IMPR] Add explicit return value for _query_continue and _continue

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/606415 ) Change subject: [IMPR] Add explicit return value for _query_continue and _continue ...................................................................... [IMPR] Add explicit return value for _query_continue and _continue - Add explicit return value for thes QueryGenerator methods. _query_continue and _continue are called in line 2889 and expects a boolean result; the function is assigned in 2471 and 2474. But only _query_continue returns True only for one part of processing. All other cases return implicit None but an explicit False should be returned instead. - return None in Request._simulate as last resort - Futhermore remove PY2 related code Change-Id: I36340e56ab18a7e78202bc8a314fca9f8958c353 --- M pywikibot/data/api.py 1 file changed, 70 insertions(+), 112 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 4b421dc..217fc51 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -5,28 +5,24 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import datetime import hashlib import inspect import json import os +import pickle import pprint import re import traceback -try: - from collections.abc import Container, MutableMapping, Sized -except ImportError: # Python 2.7 - from collections import Container, MutableMapping, Sized -from email.mime.nonmultipart import MIMENonMultipart -from warnings import warn -try: - import cPickle as pickle # noqa: N813 -except ImportError: - import pickle +from collections.abc import Container, MutableMapping, Sized +from email.generator import BytesGenerator +from email.mime.multipart import MIMEMultipart as MIMEMultipartOrig +from email.mime.nonmultipart import MIMENonMultipart +from io import BytesIO +from warnings import warn +from urllib.parse import urlencode, unquote import pywikibot @@ -39,62 +35,11 @@ ) from pywikibot.family import SubdomainFamily from pywikibot.tools import ( - deprecated, itergroup, PY2, PYTHON_VERSION, - getargspec, UnicodeType, remove_last_args + deprecated, itergroup, PYTHON_VERSION, + getargspec, remove_last_args ) from pywikibot.tools.formatter import color_format -if not PY2: - from urllib.parse import urlencode, unquote - - # Bug: T113120, T228841 - # Subclassing necessary to fix bug of the email package in Python 3: - # see https://bugs.python.org/issue19003 - # see https://bugs.python.org/issue18886 - # The following solution might be removed if the bug is fixed for - # Python versions which are supported by PWB. - - from email.generator import BytesGenerator - from email.mime.multipart import MIMEMultipart as MIMEMultipartOrig - from io import BytesIO - - class CTEBinaryBytesGenerator(BytesGenerator): - - """Workaround for bug in python 3 email handling of CTE binary.""" - - def __init__(self, *args, **kwargs): - """Initializer.""" - super(CTEBinaryBytesGenerator, self).__init__(*args, **kwargs) - self._writeBody = self._write_body - - def _write_body(self, msg): - if msg['content-transfer-encoding'] == 'binary': - self._fp.write(msg.get_payload(decode=True)) - else: - super(CTEBinaryBytesGenerator, self)._handle_text(msg) - - class CTEBinaryMIMEMultipart(MIMEMultipartOrig): - - """Workaround for bug in python 3 email handling of CTE binary.""" - - def as_bytes(self, unixfrom=False, policy=None): - """Return unmodified binary payload.""" - policy = self.policy if policy is None else policy - fp = BytesIO() - g = CTEBinaryBytesGenerator(fp, mangle_from_=False, policy=policy) - g.flatten(self, unixfrom=unixfrom) - return fp.getvalue() - - MIMEMultipart = CTEBinaryMIMEMultipart -else: - from urllib import urlencode, unquote - from email.mime.multipart import MIMEMultipart - - # Bug: T243710 (Python 2) - # see https://github.com/jxtech/wechatpy/issues/375 - from urllib import quote - quote(b'non-empty-string', safe=b'') - _logger = 'data.api' @@ -117,6 +62,45 @@ http.cookie_jar.clear(cookie.domain, cookie.path, cookie.name) +# Bug: T113120, T228841 +# Subclassing necessary to fix bug of the email package in Python 3: +# see https://bugs.python.org/issue19003 +# see https://bugs.python.org/issue18886 +# The following solution might be removed if the bug is fixed for +# Python versions which are supported by PWB, probably with Python 3.5 + +class CTEBinaryBytesGenerator(BytesGenerator): + + """Workaround for bug in python 3 email handling of CTE binary.""" + + def __init__(self, *args, **kwargs): + """Initializer.""" + super(CTEBinaryBytesGenerator, self).__init__(*args, **kwargs) + self._writeBody = self._write_body + + def _write_body(self, msg): + if msg['content-transfer-encoding'] == 'binary': + self._fp.write(msg.get_payload(decode=True)) + else: + super(CTEBinaryBytesGenerator, self)._handle_text(msg) + + +class CTEBinaryMIMEMultipart(MIMEMultipartOrig): + + """Workaround for bug in python 3 email handling of CTE binary.""" + + def as_bytes(self, unixfrom=False, policy=None): + """Return unmodified binary payload.""" + policy = self.policy if policy is None else policy + fp = BytesIO() + g = CTEBinaryBytesGenerator(fp, mangle_from_=False, policy=policy) + g.flatten(self, unixfrom=unixfrom) + return fp.getvalue() + + +MIMEMultipart = CTEBinaryMIMEMultipart + + class APIError(Error): """The wiki site returned an error message.""" @@ -126,7 +110,7 @@ self.code = code self.info = info self.other = kwargs - self.unicode = UnicodeType(self.__str__()) + self.unicode = self.__str__() def __repr__(self): """Return internal representation.""" @@ -330,7 +314,7 @@ assert('mime' in result['help']) assert(result['help']['mime'] == 'text/plain') assert('help' in result['help']) - assert(isinstance(result['help']['help'], UnicodeType)) + assert(isinstance(result['help']['help'], str)) help_text = result['help']['help'] @@ -374,7 +358,7 @@ @type modules: iterable or basestring @rtype: set """ - if isinstance(modules, UnicodeType): + if isinstance(modules, str): return set(modules.split('|')) return set(modules) @@ -1065,9 +1049,9 @@ """A request to a Site's api.php interface. Attributes of this object (except for the special parameters listed - below) get passed as commands to api.php, and can be get or set using - the dict interface. All attributes must be strings (or unicode). Use - an empty string for parameters that don't require a value. For example, + below) get passed as commands to api.php, and can be get or set + using the dict interface. All attributes must be strings. Use an + empty string for parameters that don't require a value. For example, Request(action="query", titles="Foo bar", prop="info", redirects="") corresponds to the API request "api.php?action=query&titles=Foo%20bar&prop=info&redirects" @@ -1353,8 +1337,7 @@ * datetime.datetime (using strftime and ISO8601 format) * pywikibot.page.BasePage (using title (+namespace; -section)) - All other datatypes are converted to string using unicode() on Python 2 - and str() on Python 3. + All other datatypes are converted to string. """ if isinstance(value, datetime.datetime): return value.strftime(pywikibot.Timestamp.ISO8601Format) @@ -1362,7 +1345,7 @@ assert(value.site == self.site) return value.title(with_section=False) else: - return UnicodeType(value) + return str(value) def __getitem__(self, key): """Implement dict interface.""" @@ -1379,15 +1362,14 @@ @type value: str in site encoding (string types may be a `|`-separated list) - iterable, where items are converted to unicode + iterable, where items are converted to string with special handling for datetime.datetime to convert it to a string using the ISO 8601 format accepted by the MediaWiki API. """ - # Allow site encoded bytes (note: str is a subclass of bytes in py2) if isinstance(value, bytes): value = value.decode(self.site.encoding()) - if isinstance(value, UnicodeType): + if isinstance(value, str): value = value.split('|') if hasattr(value, 'api_iter'): @@ -1542,10 +1524,6 @@ # which is not a superset of ascii may be problematic. try: value.encode('ascii') - # In Python 2, ascii API params should be represented as 'foo' - # rather than u'foo' - if PY2: - value = str(value) except UnicodeError: try: value = value.encode(self.site.encoding()) @@ -1553,10 +1531,7 @@ pywikibot.error( "_encoded_items: '%s' could not be encoded as '%s':" ' %r' % (key, self.site.encoding(), value)) - if PY2: - key = key.encode('ascii') - else: - assert key.encode('ascii') + assert key.encode('ascii') assert isinstance(key, str) params[key] = value return params @@ -1596,6 +1571,7 @@ if config.simulate is not True: pywikibot.sleep(float(config.simulate)) return {action: {'result': 'Success', 'nochange': ''}} + return None def _is_wikibase_error_retryable(self, error): ERR_MSG = ( @@ -1687,10 +1663,7 @@ container.attach(submsg) # strip the headers to get the HTTP message body - if not PY2: - body = container.as_bytes() - else: - body = container.as_string() + body = container.as_bytes() marker = b'\n\n' # separates headers from body eoh = body.find(marker) body = body[eoh + len(marker):] @@ -1767,7 +1740,7 @@ @raises APIError: unknown action found @raises APIError: unknown query result type """ - if not isinstance(data, UnicodeType): + if not isinstance(data, str): data = data.decode(self.site.encoding()) pywikibot.debug(('API response received from {}:\n' .format(self.site)) + data, _logger) @@ -1897,12 +1870,7 @@ pywikibot.error('Detected MediaWiki API exception {}{}' .format(e, '; retrying' if retry else '; raising')) - # Due to bug T66958, Page's repr may return non ASCII bytes - # Get as bytes in PY2 and decode with the console encoding as - # the rest should be ASCII anyway. param_repr = str(self._params) - if PY2: - param_repr = param_repr.decode(config.console_encoding) pywikibot.log('MediaWiki exception {} details:\n' ' query=\n{}\n' ' response=\n{}' @@ -2020,7 +1988,7 @@ if key in ('error', 'warnings'): continue assert key not in error - assert isinstance(result[key], UnicodeType), \ + assert isinstance(result[key], str), \ 'Unexpected %s: %r' % (key, result[key]) error[key] = result[key] @@ -2102,12 +2070,7 @@ # raise error try: - # Due to bug T66958, Page's repr may return non ASCII bytes - # Get as bytes in PY2 and decode with the console encoding as - # the rest should be ASCII anyway. param_repr = str(self._params) - if PY2: - param_repr = param_repr.decode(config.console_encoding) pywikibot.log('API Error: query=\n%s' % pprint.pformat(param_repr)) pywikibot.log(' response=\n%s' @@ -2698,7 +2661,7 @@ return False - if isinstance(namespaces, UnicodeType): + if isinstance(namespaces, str): namespaces = namespaces.split('|') # Use Namespace id (int) here; Request will cast int to str @@ -2727,11 +2690,14 @@ "Missing '%s' key(s) in ['%s'] value." % (self.continuekey, self.continue_name)) return True + for query_continue_pair in self.data['query-continue'].values(): self._add_continues(query_continue_pair) + return False # a new request with query-continue is needed def _continue(self): self._add_continues(self.data['continue']) + return False # a new request with continue is needed def _add_continues(self, continue_pair): for key, value in continue_pair.items(): @@ -2872,7 +2838,7 @@ if 'query' not in self.data: pywikibot.log("%s: 'query' not found in api response." % self.__class__.__name__) - pywikibot.log(UnicodeType(self.data)) + pywikibot.log(str(self.data)) # if (query-)continue is present, self.resultkey might not have # been fetched yet if self.continue_name not in self.data: @@ -3056,7 +3022,7 @@ if isinstance(v, list): old_dict[k].extend(v) continue - assert isinstance(v, (UnicodeType, int)), ( + assert isinstance(v, (str, int)), ( 'continued API result had an unexpected type: %s' % type(v)) @@ -3286,14 +3252,6 @@ if hasattr(query, 'items'): query = list(query.items()) - if PY2: - def _encode(x): - if isinstance(x, UnicodeType): - return x.encode('utf-8') - else: - return x - query = [(pair[0], _encode(pair[1])) for pair in query] - # parameters ending on 'token' should go last # wpEditToken should go very last query.sort(key=lambda x: x[0].lower().endswith('token') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/606415 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: I36340e56ab18a7e78202bc8a314fca9f8958c353 Gerrit-Change-Number: 606415 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [tests] replace os.system usage in ui_tests.py

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/609583 ) Change subject: [tests] replace os.system usage in ui_tests.py ...................................................................... [tests] replace os.system usage in ui_tests.py As suggested replace os.system by subprocess.run; see https://docs.python.org/3.5/library/subprocess.html#replacing-os-system Change-Id: Idb2f48423e0bd664b1d0618141950f186a5925cd --- M tests/ui_tests.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Zhuyifei1999: Looks good to me, approved diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 6337eaa..3920567 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -129,7 +129,7 @@ setattr(pywikibot.ui, key, value) def cls(self): - os.system('cls') + subprocess.run('cls', shell=True) class pywikibotManager(BaseManager): @@ -683,7 +683,9 @@ def testOutputUnicodeText_no_transliterate(self): self.sendstdin( - "python -c \"import os, pywikibot; os.system('cls'); " + 'python -c \"' + 'import subprocess, pywikibot; ' + "subprocess.run('cls', shell=True); " "pywikibot.output('\\n'.join(pywikibot.handleArgs()))\" " 'Alpha Bετα Гамма دلتا\n') lines = [] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/609583 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: Idb2f48423e0bd664b1d0618141950f186a5925cd Gerrit-Change-Number: 609583 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [bugfix] remove expectedFailure decorator of test_ecoreality

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/610774 ) Change subject: [bugfix] remove expectedFailure decorator of test_ecoreality ...................................................................... [bugfix] remove expectedFailure decorator of test_ecoreality Bug: T257559 Change-Id: Ic2672416b0dd7bb7f7a734a004edf61c870f7112 --- M tests/site_detect_tests.py 1 file changed, 3 insertions(+), 12 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 0eab946..bdabad2 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -5,25 +5,19 @@ # # Distributed under the terms of the MIT license. # - -from __future__ import absolute_import, division, unicode_literals +from contextlib import suppress +from urllib.parse import urlparse from requests.exceptions import ConnectionError, Timeout import pywikibot from pywikibot.exceptions import ServerError from pywikibot.site_detect import MWSite -from pywikibot.tools import PY2 from tests import unittest_print from tests.aspects import unittest, TestCase, PatchingTestCase from tests.utils import DrySite -if not PY2: - from urllib.parse import urlparse -else: - from urlparse import urlparse - class SiteDetectionTestCase(TestCase): @@ -161,7 +155,6 @@ """ self.assertNoSite('http://wikisophia.org/index.php?title=$1') - @unittest.expectedFailure def test_ecoreality(self): """Test detection of MediaWiki sites for www.EcoReality.org. @@ -345,7 +338,5 @@ if __name__ == '__main__': # pragma: no cover - try: + with suppress(SystemExit): unittest.main() - except SystemExit: - pass -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/610774 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: Ic2672416b0dd7bb7f7a734a004edf61c870f7112 Gerrit-Change-Number: 610774 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, 9 months

[Gerrit] ...core[master]: [cleanup] Remove functions dealing with stars list

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/583062 ) Change subject: [cleanup] Remove functions dealing with stars list ...................................................................... [cleanup] Remove functions dealing with stars list stars lists functionality was replaced by wikidata and related templates where deleted around 2015 Change-Id: I7aad4b282c30356402eed611b6481bbb9a822516 --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 0 insertions(+), 159 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 5339249..58a26a6 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1906,111 +1906,6 @@ return '{{%s\n%s}}' % (template, text) -# ---------------------------------------------- -# functions dealing with stars list (deprecated) -# ---------------------------------------------- - -starsList = [ - 'bueno', - 'bom interwiki', - 'cyswllt[ _]erthygl[ _]ddethol', 'dolen[ _]ed', - 'destacado', 'destaca[tu]', - 'enllaç[ _]ad', - 'enllaz[ _]ad', - 'leam[ _]vdc', - 'legătură[ _]a[bcf]', - 'liamm[ _]pub', - 'lien[ _]adq', - 'lien[ _]ba', - 'liên[ _]kết[ _]bài[ _]chất[ _]lượng[ _]tốt', - 'liên[ _]kết[ _]chọn[ _]lọc', - 'ligam[ _]adq', - 'ligazón[ _]a[bd]', - 'ligoelstara', - 'ligoleginda', - 'link[ _][afgu]a', 'link[ _]adq', 'link[ _]f[lm]', 'link[ _]km', - 'link[ _]sm', 'linkfa', - 'na[ _]lotura', - 'nasc[ _]ar', - 'tengill[ _][úg]g', - 'ua', - 'yüm yg', - 'רא', - 'وصلة مقالة جيدة', - 'وصلة مقالة مختارة', -] - - -@deprecated(future_warning=True, since='20200324') -def get_stars(text): - """ - Extract stars templates from wikitext. - - @param text: a wiki text - @type text: str - @return: list of stars templates - @rtype: list - """ - allstars = [] - starstext = removeDisabledParts(text) - for star in starsList: - regex = re.compile(r'(\{\{(?:template:|)%s\|.*?\}\}[\s]*)' - % star, re.I) - found = regex.findall(starstext) - if found: - allstars += found - return allstars - - -@deprecated(future_warning=True, since='20200324') -def remove_stars(text, stars_list): - """ - Remove stars templates from text. - - @param text: a wiki text - @type text: str - @param start_list: list of stars templates previously found in text - @return: modified text - @rtype: str - """ - for star in stars_list: - text = text.replace(star, '') - return text - - -@deprecated(future_warning=True, since='20200324') -def append_stars(text, stars_list, site=None): - """ - Remove stars templates from text. - - @param text: a wiki text - @type text: str - @param stars_list: list of stars templates previously found in text - @type stars_list: list - @param site: a site where the given text is used. - interwiki_text_separator is used when a site object is given. - Otherwise two line separators are used to separate stars list. - @type site: BaseSite - @return: modified text - @rtype: str - """ - LS = '\n\n' if not site else site.family.interwiki_text_separator - text = text.strip() + LS - stars = stars_list[:] - stars.sort() - for element in stars: - text += element.strip() + '\n' - return text - - -@deprecated(future_warning=True, since='20200324') -def standardize_stars(text): - """Make sure that star templates are in the right order.""" - allstars = get_stars(text) - text = remove_stars(text, allstars) - return append_stars(text, allstars) - - # -------------------------- # Page parsing functionality # -------------------------- diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 9fb9461..b647ab6 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1624,60 +1624,6 @@ '!23<>\'"&&') -class TestStarList(TestCase): - - """Test starlist.""" - - net = False - - def test_basic(self): - """Test standardizing {{linkfa}} without parameters.""" - self.assertEqual( - 'foo\n{{linkfa}}\nbar\n\n', - textlib.standardize_stars('foo\n{{linkfa}}\nbar')) - - def test_with_params(self): - """Test standardizing text with {{linkfa|...}}.""" - self.assertEqual( - 'foo\nbar\n\n{{linkfa|...}}\n', - textlib.standardize_stars('foo\n{{linkfa|...}}\nbar')) - - def test_with_sorting_params(self): - """Test standardizing text with sorting parameters.""" - self.assertEqual( - 'foo\n\n{{linkfa|bar}}\n{{linkfa|de}}\n' - '{{linkfa|en}}\n{{linkfa|fr}}\n', - textlib.standardize_stars( - 'foo\n{{linkfa|en}}\n{{linkfa|de}}\n' - '{{linkfa|fr}}\n{{linkfa|bar}}')) - - def test_get_stars(self): - """Test get_starts method.""" - self.assertEqual( - ['{{linkfa|en}}\n', '{{linkfa|de}}\n', - '{{linkfa|fr}}\n', '{{linkfa|bar}}'], - textlib.get_stars( - 'foo\n{{linkfa|en}}\n{{linkfa|de}}\n' - '{{linkfa|fr}}\n{{linkfa|bar}}')) - - def test_remove_stars(self): - """Test remove_stars method.""" - self.assertEqual( - 'foo\n{{linkfa|en}}\n{{linkfa|fr}}\n{{linkfa|bar}}', - textlib.remove_stars( - 'foo\n{{linkfa|en}}\n{{linkfa|de}}\n' - '{{linkfa|fr}}\n{{linkfa|bar}}', ['{{linkfa|de}}\n'])) - - def test_append_stars(self): - """Test append_stars method.""" - self.assertEqual( - 'foo\n\n{{linkfa|bar}}\n{{linkfa|de}}\n' - '{{linkfa|en}}\n{{linkfa|fr}}\n', - textlib.append_stars( - 'foo', ['{{linkfa|en}}\n', '{{linkfa|de}}\n', - '{{linkfa|fr}}\n', '{{linkfa|bar}}'])) - - class TestExtractSections(DefaultDrySiteTestCase): """Test the extract_sections function.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/583062 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: I7aad4b282c30356402eed611b6481bbb9a822516 Gerrit-Change-Number: 583062 Gerrit-PatchSet: 8 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Dvorapa <dvorapa(a)seznam.cz> Gerrit-CC: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [cleanup] return request.submit() directly

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/606440 ) Change subject: [cleanup] return request.submit() directly ...................................................................... [cleanup] return request.submit() directly - A lot of methods assign request.submit() to a data variable and return data. Now just return request.submit() directly as data is not used elsewhere. - Remove non-useful comments - return None as default in image_repository() Change-Id: I3c5bef5b7b4c88f99ef1909a4c89032095267304 --- M pywikibot/site/__init__.py 1 file changed, 14 insertions(+), 23 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 5ee61be..698e8b8 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -2799,6 +2799,8 @@ if bool(code or fam): return pywikibot.Site(code, fam, self.username()) + return None + def data_repository(self): """ Return the data repository connected to this site. @@ -7907,7 +7909,6 @@ return wbdata['entities'][ids] else: - # not implemented yet raise NotImplementedError def data_repository(self): @@ -7927,7 +7928,7 @@ url = self.siteinfo['general'].get('wikibase-geoshapestoragebaseurl') if url: return pywikibot.Site(url=url, user=self.username()) - # todo: should this raise? + return None def tabular_data_repository(self): @@ -7936,7 +7937,7 @@ 'wikibase-tabulardatastoragebaseurl') if url: return pywikibot.Site(url=url, user=self.username()) - # todo: should this raise? + return None def loadcontent(self, identification, *props): @@ -8089,8 +8090,7 @@ params['data'] = json.dumps(data) req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('edit') def addClaim(self, entity, claim, bot=True, summary=None): @@ -8152,8 +8152,7 @@ params['baserevid'] = claim.on_item.latest_revision_id req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('edit') def save_claim(self, claim, summary=None, bot=True): @@ -8237,8 +8236,7 @@ params['snaks'] = json.dumps(snak) req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('edit') def editQualifier(self, claim, qualifier, new=False, bot=True, @@ -8275,8 +8273,7 @@ params['property'] = qualifier.getID() req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('edit') def removeClaims(self, claims, bot=True, summary=None, baserevid=None): @@ -8309,8 +8306,7 @@ } req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('edit') def removeSources(self, claim, sources, @@ -8340,8 +8336,7 @@ } req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('edit') def remove_qualifiers(self, claim, qualifiers, @@ -8372,8 +8367,7 @@ } req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('edit') def linkTitles(self, page1, page2, bot=True): @@ -8400,8 +8394,7 @@ if bot: params['bot'] = 1 req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('item-merge') @deprecated_args(ignoreconflicts='ignore_conflicts', fromItem='from_item', @@ -8437,8 +8430,7 @@ if bot: params['bot'] = 1 req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('item-redirect') def set_redirect_target(self, from_item, to_item, bot=True): @@ -8460,8 +8452,7 @@ 'bot': bot, } req = self._simple_request(**params) - data = req.submit() - return data + return req.submit() @need_right('edit') def createNewItemFromPage(self, page, bot=True, **kwargs): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/606440 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: I3c5bef5b7b4c88f99ef1909a4c89032095267304 Gerrit-Change-Number: 606440 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [4.0] Remove code duplication of pwb.py and setup.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/610062 ) Change subject: [4.0] Remove code duplication of pwb.py and setup.py ...................................................................... [4.0] Remove code duplication of pwb.py and setup.py - Remove duplicate code or Python version check: pwb.py imports mandatory or script dependecies from setup.py and setup.py check the Python version supported. Re-use this check in pwb.py - Remove PY2-related code - Additional doc for check_modules - import Path after version checking Bug: T239542 Bug: T213287 Change-Id: I476a42efc439f4fed5d10888ece76d73b294d0c8 --- M pwb.py M setup.py 2 files changed, 25 insertions(+), 44 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index e3711e0..3880526 100755 --- a/pwb.py +++ b/pwb.py @@ -18,8 +18,7 @@ # # Distributed under the terms of the MIT license. # -from __future__ import (absolute_import, division, - print_function, unicode_literals) +from __future__ import absolute_import, print_function, unicode_literals from difflib import get_close_matches from importlib import import_module @@ -30,36 +29,9 @@ from warnings import warn -PYTHON_VERSION = sys.version_info[:3] -PY2 = (PYTHON_VERSION[0] == 2) - -if not PY2: - from pathlib import Path -else: - from pathlib2 import Path - - -VERSIONS_REQUIRED_MESSAGE = """ -Pywikibot is not available on: -{version} - -This version of Pywikibot only supports Python 2.7.4+ or 3.4+. -""" - - -def python_is_supported(): - """Check that Python is supported.""" - # Any change to this must be copied to setup.py - return PYTHON_VERSION >= (3, 4, 0) or PY2 and PYTHON_VERSION >= (2, 7, 4) - - -if not python_is_supported(): - print(VERSIONS_REQUIRED_MESSAGE.format(version=sys.version)) - sys.exit(1) pwb = None - # The following snippet was developed by Ned Batchelder (and others) # for coverage [1], with python 3 support [2] added later, # and is available under the BSD license (see [3]) @@ -70,6 +42,7 @@ # [3] # https://bitbucket.org/ned/coveragepy/src/2c5fb3a8b81c/setup.py?at=default#c… + def run_python_file(filename, argv, argvu, package=None): """Run a python file as if it were the main program on the command line. @@ -79,17 +52,12 @@ """ # Create a module to serve as __main__ old_main_mod = sys.modules['__main__'] - # it's explicitly using str() to bypass unicode_literals in Python 2 - main_mod = types.ModuleType(str('__main__')) + main_mod = types.ModuleType('__main__') sys.modules['__main__'] = main_mod main_mod.__file__ = filename - if not PY2: - main_mod.__builtins__ = sys.modules['builtins'] - else: - main_mod.__builtins__ = sys.modules['__builtin__'] + main_mod.__builtins__ = sys.modules['builtins'] if package: - # it's explicitly using str() to bypass unicode_literals in Python 2 - main_mod.__package__ = str(package) + main_mod.__package__ = package # Set sys.argv and the first path element properly. old_argv = sys.argv @@ -163,7 +131,16 @@ def check_modules(script=None): - """Check whether mandatory modules are present.""" + """Check whether mandatory modules are present. + + This also checks Python version when importing deptendencies from setup.py + + @param script: The script name to be checked for dependencies + @type script: str or None + @return: True if all dependencies are installed + @rtype: bool + @raise RuntimeError: wrong Python version found in setup.py + """ import pkg_resources if script: from setup import script_deps @@ -201,9 +178,15 @@ return not missing_requirements -if not check_modules(): +try: + if not check_modules(): + raise RuntimeError('') # no further output needed +except RuntimeError as e: + print(e) sys.exit() +from pathlib import Path # noqa: E402 + filename, script_args, global_args = handle_args(*sys.argv) # Search for user-config.py before creating one. @@ -211,8 +194,6 @@ # directories. See config2.py for details on search order. # Use env var to communicate to config2.py pwb.py location (bug T74918). _pwb_dir = os.path.split(__file__)[0] -if sys.platform == 'win32' and PY2: - _pwb_dir = str(_pwb_dir) os.environ['PYWIKIBOT_DIR_PWB'] = _pwb_dir try: import pywikibot as pwb diff --git a/setup.py b/setup.py index fe41208..9ecd187 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ PYTHON_VERSION = sys.version_info[:3] -versions_required_message = """ +VERSIONS_REQUIRED_MESSAGE = """ Pywikibot is not available on: {version} @@ -46,12 +46,12 @@ def python_is_supported(): """Check that Python is supported.""" - # Any change to this must be copied to pwb.py return PYTHON_VERSION >= (3, 5, 0) if not python_is_supported(): - raise RuntimeError(versions_required_message.format(version=sys.version)) + # pwb.py checks this exception + raise RuntimeError(VERSIONS_REQUIRED_MESSAGE.format(version=sys.version)) # ------- setup extra_requires ------- # extra_deps = { -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/610062 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: I476a42efc439f4fed5d10888ece76d73b294d0c8 Gerrit-Change-Number: 610062 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [cleanup] Deprecate some page generators

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/534955 ) Change subject: [cleanup] Deprecate some page generators ...................................................................... [cleanup] Deprecate some page generators Deprecate page generators which can be easily replaced by the related site generators: - DeadendPagesPageGenerator -> deadendpages - FileLinksGenerator -> usingPages - ImagesPageGenerator -> imagelinks - LinkedPageGenerator -> linkedPages - LinksearchPageGenerator -> exturlusage - LonelyPagesPageGenerator -> lonelypages - page_with_property_generator -> pages_with_property - PagesFromPageidGenerator -> load_pages_from_pageids - RandomPageGenerator -> randompages - RandomRedirectPageGenerator -> randompages - ReferringPageGenerator -> getReferences - SearchPageGenerator -> search - UnCategorizedCategoryGenerator -> uncategorizedcategories - UnCategorizedImageGenerator -> uncategorizedimages - UnCategorizedPageGenerator -> uncategorizedpages - UnCategorizedTemplateGenerator -> uncategorizedtemplates - UnusedFilesGenerator -> unusedfiles - UnwatchedPagesPageGenerator -> unwatchedpage - WithoutInterwikiPageGenerator -> withoutinterwiki Change-Id: I08dde93a43e4b8cb0aa40fa18fcd6282298bfa4b --- M pywikibot/pagegenerators.py 1 file changed, 58 insertions(+), 41 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 1521617..6dd9cd9 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -707,8 +707,8 @@ 'processed?') if not value.startswith(self.site.namespace(6) + ':'): value = 'Image:' + value - page = pywikibot.FilePage(self.site, value) - return FileLinksGenerator(page) + file_page = pywikibot.FilePage(self.site, value) + return file_page.usingPages() def _handle_linter(self, value): """Handle `-linter` argument.""" @@ -770,16 +770,15 @@ def _handle_unusedfiles(self, value): """Handle `-unusedfiles` argument.""" - return UnusedFilesGenerator(total=_int_none(value), site=self.site) + return self.site.unusedfiles(total=_int_none(value)) def _handle_lonelypages(self, value): """Handle `-lonelypages` argument.""" - return LonelyPagesPageGenerator(total=_int_none(value), site=self.site) + return self.site.lonelypages(total=_int_none(value)) def _handle_unwatched(self, value): """Handle `-unwatched` argument.""" - return UnwatchedPagesPageGenerator( - total=_int_none(value), site=self.site) + return self.site.unwatchedpage(total=_int_none(value)) def _handle_wantedpages(self, value): """Handle `-wantedpages` argument.""" @@ -807,7 +806,7 @@ if value in '?' or value not in pnames: prefix, value = pywikibot.input_choice( question, ShowingListOption(pnames)) - return page_with_property_generator(value, site=self.site) + return self.site.pages_with_property(value) def _handle_usercontribs(self, value): """Handle `-usercontribs` argument.""" @@ -817,8 +816,7 @@ def _handle_withoutinterwiki(self, value): """Handle `-withoutinterwiki` argument.""" - return WithoutInterwikiPageGenerator( - total=_int_none(value), site=self.site) + return self.site.withoutinterwiki(total=_int_none(value)) def _handle_interwiki(self, value): """Handle `-interwiki` argument.""" @@ -836,8 +834,8 @@ # before -randomredirect # otherwise default namespace is 0 namespaces = self.namespaces or 0 - return RandomRedirectPageGenerator( - total=_int_none(value), site=self.site, namespaces=namespaces) + return self.site.randompages(total=_int_none(value), + namespaces=namespaces, redirects=True) def _handle_random(self, value): """Handle `-random` argument.""" @@ -846,8 +844,8 @@ # before -random # otherwise default namespace is 0 namespaces = self.namespaces or 0 - return RandomPageGenerator( - total=_int_none(value), site=self.site, namespaces=namespaces) + return self.site.randompages(total=_int_none(value), + namespaces=namespaces) def _handle_recentchanges(self, value): """Handle `-recentchanges` argument.""" @@ -958,19 +956,19 @@ """Handle `-pageid` argument.""" if not value: value = pywikibot.input('What pageid do you want to use?') - return PagesFromPageidGenerator(value, site=self.site) + return self.site.load_pages_from_pageids(value) def _handle_uncatfiles(self, value): """Handle `-uncatfiles` argument.""" - return UnCategorizedImageGenerator(site=self.site) + return self.site.uncategorizedimages() def _handle_uncatcat(self, value): """Handle `-uncatcat` argument.""" - return UnCategorizedCategoryGenerator(site=self.site) + return self.site.uncategorizedcategories() def _handle_uncat(self, value): """Handle `-uncat` argument.""" - return UnCategorizedPageGenerator(site=self.site) + return self.site.uncategorizedpages() def _handle_ref(self, value): """Handle `-ref` argument.""" @@ -978,7 +976,7 @@ value = pywikibot.input( 'Links to which page should be processed?') page = pywikibot.Page(pywikibot.Link(value, self.site)) - return ReferringPageGenerator(page) + return page.getReferences() def _handle_links(self, value): """Handle `-links` argument.""" @@ -986,14 +984,14 @@ value = pywikibot.input( 'Links from which page should be processed?') page = pywikibot.Page(pywikibot.Link(value, self.site)) - return LinkedPageGenerator(page) + return page.linkedPages() def _handle_weblink(self, value): """Handle `-weblink` argument.""" if not value: value = pywikibot.input( 'Pages with which weblink should be processed?') - return LinksearchPageGenerator(value, site=self.site) + return self.site.exturlusage(value) def _handle_transcludes(self, value): """Handle `-transcludes` argument.""" @@ -1003,7 +1001,7 @@ page = pywikibot.Page(pywikibot.Link(value, default_namespace=10, source=self.site)) - return ReferringPageGenerator(page, onlyTemplateInclusion=True) + return page.getReferences(only_template_inclusion=True) def _handle_start(self, value): """Handle `-start` argument.""" @@ -1044,7 +1042,7 @@ value = pywikibot.input( 'Images on which page should be processed?') page = pywikibot.Page(pywikibot.Link(value, self.site)) - return ImagesPageGenerator(page) + return page.imagelinks() def _handle_searchitem(self, value): """Handle `-searchitem` argument.""" @@ -1061,7 +1059,7 @@ if not value: value = pywikibot.input('What do you want to search for?') # In order to be useful, all namespaces are required - return SearchPageGenerator(value, namespaces=[], site=self.site) + return self.site.search(value, namespaces=[]) @staticmethod def _handle_google(value): @@ -1474,15 +1472,17 @@ return site.unconnected_pages(total=total) +@deprecated('File.usingPages()', since='20200515') @deprecated_args(referredImagePage='referredFilePage', step=None) def FileLinksGenerator(referredFilePage, total=None, content=False): - """Yield Pages on which the file referredFilePage is displayed.""" + """DEPRECATED. Yield Pages on which referredFilePage file is displayed.""" return referredFilePage.usingPages(total=total, content=content) +@deprecated('Page.imagelinks()', since='20200515') @deprecated_args(step=None) def ImagesPageGenerator(pageWithImages, total=None, content=False): - """Yield FilePages displayed on pageWithImages.""" + """DEPRECATED. Yield FilePages displayed on pageWithImages.""" return pageWithImages.imagelinks(total=total, content=content) @@ -1497,12 +1497,13 @@ return (pywikibot.Page(link) for link in page.iterlanglinks(total=total)) +@deprecated('Page.getReferences()', since='20200515') @deprecated_args(step=None) def ReferringPageGenerator(referredPage, followRedirects=False, withTemplateInclusion=True, onlyTemplateInclusion=False, total=None, content=False): - """Yield all pages referring to a specific page.""" + """DEPRECATED. Yield all pages referring to a specific page.""" return referredPage.getReferences( follow_redirects=followRedirects, with_template_inclusion=withTemplateInclusion, @@ -1572,9 +1573,10 @@ yield s +@deprecated('Page.linkedPages()', since='20200515') @deprecated_args(step=None) def LinkedPageGenerator(linkingPage, total=None, content=False): - """Yield all pages linked from a specific page. + """DEPRECATED. Yield all pages linked from a specific page. See L{pywikibot.page.BasePage.linkedPages} for details. @@ -1644,9 +1646,10 @@ yield pywikibot.Page(pywikibot.Link(title, site)) +@deprecated('site.load_pages_from_pageids()', since='20200515') def PagesFromPageidGenerator(pageids, site=None): """ - Return a page generator from pageids. + DEPRECATED. Return a page generator from pageids. Pages are iterated in the same order than in the underlying pageids. Pageids are filtered and only one page is returned in case of @@ -2336,10 +2339,11 @@ yield page +@deprecated('Site.unusedfiles()', since='20200515') @deprecated_args(extension=None, number='total', repeat=None) def UnusedFilesGenerator(total=None, site=None): """ - Unused files generator. + DEPRECATED. Unused files generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2351,10 +2355,11 @@ return site.unusedfiles(total=total) +@deprecated('Site.withoutinterwiki()', since='20200515') @deprecated_args(number='total', repeat=None) def WithoutInterwikiPageGenerator(total=None, site=None): """ - Page lacking interwikis generator. + DEPRECATED. Page lacking interwikis generator. @param total: Maximum number of pages to retrieve in total @param site: Site for generator results. @@ -2365,10 +2370,11 @@ return site.withoutinterwiki(total=total) +@deprecated('Site.uncategorizedcategories()', since='20200515') @deprecated_args(number='total', repeat=None) def UnCategorizedCategoryGenerator(total=100, site=None): """ - Uncategorized category generator. + DEPRECATED. Uncategorized category generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2380,10 +2386,11 @@ return site.uncategorizedcategories(total=total) +@deprecated('Site.uncategorizedimages()', since='20200515') @deprecated_args(number='total', repeat=None) def UnCategorizedImageGenerator(total=100, site=None): """ - Uncategorized file generator. + DEPRECATED. Uncategorized file generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2395,10 +2402,11 @@ return site.uncategorizedimages(total=total) +@deprecated('Site.uncategorizedpages()', since='20200515') @deprecated_args(number='total', repeat=None) def UnCategorizedPageGenerator(total=100, site=None): """ - Uncategorized page generator. + DEPRECATED. Uncategorized page generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2410,10 +2418,11 @@ return site.uncategorizedpages(total=total) +@deprecated('Site.uncategorizedtemplates()', since='20200515') @deprecated_args(number='total', repeat=None) def UnCategorizedTemplateGenerator(total=100, site=None): """ - Uncategorized template generator. + DEPRECATED. Uncategorized template generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2425,10 +2434,11 @@ return site.uncategorizedtemplates(total=total) +@deprecated('Site.lonelypages()', since='20200515') @deprecated_args(number='total', repeat=None) def LonelyPagesPageGenerator(total=None, site=None): """ - Lonely page generator. + DEPRECATED. Lonely page generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2440,10 +2450,11 @@ return site.lonelypages(total=total) +@deprecated('Site.unwatchedpages()', since='20200515') @deprecated_args(number='total', repeat=None) def UnwatchedPagesPageGenerator(total=None, site=None): """ - Unwatched page generator. + DEPRECATED. Unwatched page generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2455,6 +2466,7 @@ return site.unwatchedpages(total=total) +@deprecated('Site.pages_with_property()', since='20200515') def page_with_property_generator(name, total=None, site=None): """ Special:PagesWithProperty page generator. @@ -2501,10 +2513,11 @@ return (page for page, _ in site.ancientpages(total=total)) +@deprecated('Site.deadendpages()', since='20200515') @deprecated_args(number='total', repeat=None) def DeadendPagesPageGenerator(total=100, site=None): """ - Dead-end page generator. + DEPRECATED. Dead-end page generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2546,10 +2559,11 @@ return (page for page, _ in site.shortpages(total=total)) +@deprecated('Site.randompages()', since='20200515') @deprecated_args(number='total') def RandomPageGenerator(total=None, site=None, namespaces=None): """ - Random page generator. + DEPRECATED. Random page generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2561,10 +2575,11 @@ return site.randompages(total=total, namespaces=namespaces) +@deprecated('Site.randompages()', since='20200515') @deprecated_args(number='total') def RandomRedirectPageGenerator(total=None, site=None, namespaces=None): """ - Random redirect generator. + DEPRECATED. Random redirect generator. @param total: Maximum number of pages to retrieve in total @type total: int @@ -2577,10 +2592,11 @@ redirects=True) +@deprecated('Site.exturlusage()', since='20200515') @deprecated_args(link='url', euprotocol='protocol', step=None) def LinksearchPageGenerator(url, namespaces=None, total=None, site=None, protocol=None): - """Yield all pages that link to a certain URL, like Special:Linksearch. + """DEPRECATED. Yield all pages that link to a certain URL. @param url: The URL to search for (with ot without the protocol prefix); this may include a '*' as a wildcard, only at the start of the @@ -2602,10 +2618,11 @@ total=total, content=False) +@deprecated('Site.search()', since='20200515') @deprecated_args(number='total', step=None) def SearchPageGenerator(query, total=None, namespaces=None, site=None): """ - Yield pages from the MediaWiki internal search engine. + DEPRECATED. Yield pages from the MediaWiki internal search engine. @param total: Maximum number of pages to retrieve in total @type total: int -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/534955 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: I08dde93a43e4b8cb0aa40fa18fcd6282298bfa4b Gerrit-Change-Number: 534955 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [tests] Print the exception tested with assertNoSite

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/592487 ) Change subject: [tests] Print the exception tested with assertNoSite ...................................................................... [tests] Print the exception tested with assertNoSite assertNoSite expects several exception when trying to create a MWSite from url. But is is not clear, why creating the MWSite fails. This can be happen if a urls doesn't exist any longer. Therefore print the exception with this tests. Change-Id: I80fcdfb68a15f75fe0650af83814c0e52e335e32 --- M tests/site_detect_tests.py 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index a5f6230..34ffaf5 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -15,6 +15,7 @@ from pywikibot.site_detect import MWSite from pywikibot.tools import PY2 +from tests import unittest_print from tests.aspects import unittest, TestCase, PatchingTestCase from tests.utils import DrySite @@ -51,8 +52,11 @@ @type url: str @raises AssertionError: Site under url is MediaWiki powered """ - self.assertRaises((AttributeError, ConnectionError, RuntimeError, - ServerError, Timeout), MWSite, url) + with self.assertRaises((AttributeError, ConnectionError, RuntimeError, + ServerError, Timeout)) as e: + MWSite(url) + unittest_print('\nassertNoSite expected exception:\n{e!r}' + .format(e=e.exception)) class StandardVersionSiteTestCase(SiteDetectionTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/592487 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: I80fcdfb68a15f75fe0650af83814c0e52e335e32 Gerrit-Change-Number: 592487 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [tests] Add flake8-color to provide a color format string

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/592483 ) Change subject: [tests] Add flake8-color to provide a color format string ...................................................................... [tests] Add flake8-color to provide a color format string This enables to easy find the flake8 error messages Bug: T117570 Change-Id: Ibbe0a165d1f4caa13379728bc6513365bde9a946 --- M setup.py M tox.ini 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 21711c2..efc9e49 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ 'pydocstyle>=4.0.0;python_version>="3.4"', 'hacking', 'flake8-coding', + 'flake8-colors', 'flake8-comprehensions>=3.1.4;python_version>="3.8"', 'flake8-comprehensions>=2.2.0;python_version>="3.5"', 'flake8-comprehensions>=2.0.0,<2.2.0;python_version=="3.4"', diff --git a/tox.ini b/tox.ini index d34bd55..c1ad738 100644 --- a/tox.ini +++ b/tox.ini @@ -107,6 +107,8 @@ accept-encodings = utf-8 require-code = true classmethod-decorators = classmethod,classproperty +# flake8-color format string +format = ${blue}%(path)s${reset}: ${bold}line %(row)d:${reset}%(col)d: ${red_bold}%(code)s${reset} %(text)s # The following are to be fixed # N802: function name should be lowercase -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/592483 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: Ibbe0a165d1f4caa13379728bc6513365bde9a946 Gerrit-Change-Number: 592483 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [IMPR] derive ParamInfo from collections.abc.Sized

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/605850 ) Change subject: [IMPR] derive ParamInfo from collections.abc.Sized ...................................................................... [IMPR] derive ParamInfo from collections.abc.Sized - ParamInfo is a sized container. Derive this class from collections.abc.Sized too and make __len__ definition mandatory Change-Id: I1e38db40818ba8c03f1b125e08e36cce4d1dd4cf --- M pywikibot/data/api.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 8a80457..4414493 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -17,9 +17,9 @@ import traceback try: - from collections.abc import Container, MutableMapping + from collections.abc import Container, MutableMapping, Sized except ImportError: # Python 2.7 - from collections import Container, MutableMapping + from collections import Container, MutableMapping, Sized from email.mime.nonmultipart import MIMENonMultipart from warnings import warn @@ -182,7 +182,7 @@ super(APIMWException, self).__init__(code, info, **kwargs) -class ParamInfo(Container): +class ParamInfo(Sized, Container): """ API parameter information data object. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/605850 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: I1e38db40818ba8c03f1b125e08e36cce4d1dd4cf Gerrit-Change-Number: 605850 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2020