Pywikibot-commits October 2020

pywikibot-commits@lists.wikimedia.org

1 participants
186 discussions

[Gerrit] ...core[master]: [cleanup] rename HttpRequest properties to request.Response identifiers
by jenkins-bot (Code Review) 19 Oct '20

19 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/633352 ) Change subject: [cleanup] rename HttpRequest properties to request.Response identifiers ...................................................................... [cleanup] rename HttpRequest properties to request.Response identifiers HttpRequest properties and methods should be renamed to the corresponding requests.Resonse methods/properties HttpRequest: - rename HttpRequest.headers attribute to all_headers - rename HttpRequest.status property to status_code - rename HttpRequest.uri to url - show a FutureWarning for HttpRequest.content property because it is needed for raw - deprecate HttpRequest.parsed_uri and hostname - deprecate HttpRequest.__str__ and HttpRequest.__bytes__ - update other files accordingly Bug: T265206 Change-Id: I3f52e045364cf540254208b05e1c149de4d69646 --- M pywikibot/comms/http.py M pywikibot/comms/threadedhttp.py M pywikibot/page/__init__.py M pywikibot/pagegenerators.py M tests/aspects.py M tests/http_tests.py 6 files changed, 98 insertions(+), 43 deletions(-) Approvals: Mpaa: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index fc201d7..8aa371a 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -298,7 +298,7 @@ uri = http_request.uri params = http_request.params body = http_request.body - headers = http_request.headers + headers = http_request.all_headers auth = get_authentication(uri) if auth is not None and len(auth) == 4: if isinstance(requests_oauthlib, ImportError): @@ -337,20 +337,21 @@ if SSL_CERT_VERIFY_FAILED_MSG in str(request.data): raise FatalServerError(str(request.data)) - if request.status == 504: - raise Server504Error('Server %s timed out' % request.hostname) + if request.status_code == 504: + raise Server504Error('Server {} timed out' + .format(urlparse(request.url).netloc)) - if request.status == 414: + if request.status_code == 414: raise Server414Error('Too long GET request') if isinstance(request.data, Exception): - error('An error occurred for uri ' + request.uri) + error('An error occurred for uri ' + request.url) raise request.data from None # HTTP status 207 is also a success status for Webdav FINDPROP, # used by the version module. - if request.status not in (200, 207): - warning('Http response status {0}'.format(request.data.status_code)) + if request.status_code not in (200, 207): + warning('Http response status {}'.format(request.status_code)) @deprecated(since='20201015', future_warning=True) diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 8b4338e..d706d04 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -12,7 +12,7 @@ from urllib.parse import urlparse import pywikibot -from pywikibot.tools import deprecated +from pywikibot.tools import deprecated, deprecated_args _logger = 'comms.threadedhttp' @@ -27,43 +27,76 @@ * an exception """ - def __init__(self, uri, method='GET', params=None, body=None, headers=None, - callbacks=None, charset=None, **kwargs): + @deprecated_args(headers='all_headers', uri='url') + def __init__(self, url, method='GET', params=None, body=None, + all_headers=None, callbacks=None, charset=None, **kwargs): """Initializer. See C{Http.request} for parameters. """ - self.uri = uri + self.url = url self.method = method self.params = params self.body = body - self.headers = headers + self.all_headers = all_headers if isinstance(charset, codecs.CodecInfo): self.charset = charset.name elif charset: self.charset = charset - elif headers and 'accept-charset' in headers: - self.charset = headers['accept-charset'] + elif all_headers and 'accept-charset' in all_headers: + self.charset = all_headers['accept-charset'] else: self.charset = None self.callbacks = callbacks - self.args = [uri, method, body, headers] + self.args = [url, method, body, all_headers] self.kwargs = kwargs self._parsed_uri = None self._data = None @property + @deprecated('the `url` attribute', since='20201011', future_warning=True) + def uri(self): + """DEPRECATED. Return the response URL.""" + return self.url + + @uri.setter + @deprecated('the `url` attribute', since='20201011', future_warning=True) + def uri(self, value): + """DEPRECATED. Set the response URL.""" + self.url = value + + @property + @deprecated('the `all_headers` property', since='20201011', + future_warning=True) + def headers(self): + """DEPRECATED. Return the response headers.""" + return self.all_headers + + @headers.setter + @deprecated('the `all_headers` property', since='20201011', + future_warning=True) + def headers(self, value): + """DEPRECATED. Set the response headers.""" + self.all_headers = value + + @property def data(self): - """Return the requests response tuple.""" + """DEPRECATED. Return the requests response tuple. + + @note: This property will removed. + """ assert(self._data is not None) return self._data @data.setter def data(self, value): - """Set the requests response and invoke each callback.""" + """DEPRECATED. Set the requests response and invoke each callback. + + @note: This property setter will removed. + """ self._data = value if self.callbacks: @@ -72,12 +105,18 @@ @property def exception(self) -> Optional[Exception]: - """Get the exception, if any.""" + """DEPRECATED. Get the exception, if any. + + @note: This property will removed. + """ return self.data if isinstance(self.data, Exception) else None @property def response_headers(self) -> Optional[Dict[str, str]]: - """Return the response headers.""" + """DEPRECATED. Return the response headers. + + @note: This property will renamed to headers. + """ return self.data.headers if not self.exception else None @property @@ -86,23 +125,31 @@ return self.data.content if not self.exception else None @property + @deprecated('urlparse(HttpRequest.url)', + since='20201011', future_warning=True) def parsed_uri(self): - """Return the parsed requested uri.""" + """DEPRECATED. Return the parsed requested uri.""" if not self._parsed_uri: self._parsed_uri = urlparse(self.uri) return self._parsed_uri @property + @deprecated('urlparse(HttpRequest.url).netloc', + since='20201011', future_warning=True) def hostname(self): - """Return the host of the request.""" + """DEPRECATED. Return the host of the request.""" return self.parsed_uri.netloc @property - def status(self): - """Return the HTTP response status. + @deprecated('the `status_code` property', since='20201011', + future_warning=True) + def status(self) -> Optional[int]: + """DEPRECATED. Return the HTTP response status.""" + return self.status_code - @rtype: int - """ + @property + def status_code(self) -> Optional[int]: + """Return the HTTP response status.""" return self.data.status_code if not self.exception else None @property @@ -173,25 +220,32 @@ result = encoding return result + @deprecated('the `text` property', since='20201011', future_warning=True) def decode(self, encoding, errors='strict') -> str: """Return the decoded response.""" return self.raw.decode(encoding, errors) @property - @deprecated('the `text` property', since='20180321') + @deprecated('the `text` property', since='20180321', future_warning=True) def content(self) -> str: - """DEPRECATED. Return the response decoded by the detected encoding.""" + """DEPRECATED. Return the response decoded by the detected encoding. + + @note: The behaviour will be changed. + This method will return the content of the response in bytes. + """ return self.text @property def text(self) -> str: """Return the response decoded by the detected encoding.""" - return self.decode(self.encoding) + return self.raw.decode(self.encoding) + @deprecated('the `text` property', since='20201011', future_warning=True) def __str__(self) -> str: """Return the response decoded by the detected encoding.""" return self.text + @deprecated(since='20201011', future_warning=True) def __bytes__(self) -> Optional[bytes]: """Return the undecoded response.""" return self.raw diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 55c9a23..48c1499 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -2645,7 +2645,8 @@ return sha1 == revision.sha1 else: pywikibot.warning( - 'Unsuccessfull request (%s): %s' % (req.status, req.uri)) + 'Unsuccessfull request ({}): {}' + .format(req.status_code, req.url)) return False def globalusage(self, total=None): diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index b301109..c29c21c 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2933,10 +2933,10 @@ req = http.fetch(url, params=self.opts) except ReadTimeout: raise ServerError( - 'received ReadTimeout from {0}'.format(url)) + 'received ReadTimeout from {}'.format(url)) if 500 <= req.status < 600: raise ServerError( - 'received {0} status from {1}'.format(req.status, req.uri)) + 'received {} status from {}'.format(req.status_code, req.url)) j = json.loads(req.text) raw_pages = j['*'][0]['a']['*'] yield from raw_pages diff --git a/tests/aspects.py b/tests/aspects.py index 24fb72c..2ab9f6e 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -505,8 +505,9 @@ if r.exception: e = r.exception else: - if r.status not in [200, 301, 302, 303, 307, 308]: - raise ServerError('HTTP status: {}'.format(r.status)) + if r.status_code not in {200, 301, 302, 303, 307, 308}: + raise ServerError('HTTP status: {}' + .format(r.status_code)) except Exception as e2: pywikibot.error('{}: accessing {} caused exception:' .format(cls.__name__, hostname)) diff --git a/tests/http_tests.py b/tests/http_tests.py index 9a8b0b7..f4f1cb4 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -43,7 +43,7 @@ """Test http._enqueue using http://www.wikipedia.org/.""" r = http._enqueue('http://www.wikipedia.org/') self.assertIsInstance(r, threadedhttp.HttpRequest) - self.assertEqual(r.status, 200) + self.assertEqual(r.status_code, 200) self.assertIn('<html lang="mul"', r.text) self.assertIsInstance(r.text, str) self.assertIsInstance(r.raw, bytes) @@ -52,11 +52,9 @@ """Test http.fetch using http://www.wikipedia.org/.""" r = http.fetch('http://www.wikipedia.org/') self.assertIsInstance(r, threadedhttp.HttpRequest) - self.assertEqual(r.status, 200) + self.assertEqual(r.status_code, 200) self.assertIn('<html lang="mul"', r.text) self.assertIsInstance(r.text, str) - with suppress_warnings(r'.*HttpRequest\.content is deprecated'): - self.assertEqual(r.content, r.text) self.assertIsInstance(r.raw, bytes) @@ -614,10 +612,10 @@ def test_no_params(self): """Test fetch method with no parameters.""" r = http.fetch(uri=self.url, params={}) - if r.status == 503: # T203637 + if r.status_code == 503: # T203637 self.skipTest( '503: Service currently not available for ' + self.url) - self.assertEqual(r.status, 200) + self.assertEqual(r.status_code, 200) content = json.loads(r.text) self.assertDictEqual(content['args'], {}) @@ -630,10 +628,10 @@ should be the same as what we get out. """ r = http.fetch(uri=self.url, params={'fish&chips': 'delicious'}) - if r.status == 503: # T203637 + if r.status_code == 503: # T203637 self.skipTest( '503: Service currently not available for ' + self.url) - self.assertEqual(r.status, 200) + self.assertEqual(r.status_code, 200) content = json.loads(r.text) self.assertDictEqual(content['args'], {'fish&chips': 'delicious'}) @@ -646,10 +644,10 @@ should be the same as what we get out. """ r = http.fetch(uri=self.url, params={'fish%26chips': 'delicious'}) - if r.status == 503: # T203637 + if r.status_code == 503: # T203637 self.skipTest( '503: Service currently not available for ' + self.url) - self.assertEqual(r.status, 200) + self.assertEqual(r.status_code, 200) content = json.loads(r.text) self.assertDictEqual(content['args'], {'fish%26chips': 'delicious'}) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/633352 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: I3f52e045364cf540254208b05e1c149de4d69646 Gerrit-Change-Number: 633352 Gerrit-PatchSet: 7 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]: [doc] Fix typo in ROADMAP.rst
by jenkins-bot (Code Review) 19 Oct '20

19 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/635010 ) Change subject: [doc] Fix typo in ROADMAP.rst ...................................................................... [doc] Fix typo in ROADMAP.rst Change-Id: Ie9b3d34cd0f12b9e565f4986faf84961cdeb4394 --- M ROADMAP.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 559a49f..85608df 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -20,7 +20,7 @@ * 5.0.0: DataSite.get_item() method will be removed * 5.0.0: date.MakeParameter() function will be removed * 5.0.0: pagegenerators.ReferringPageGenerator is desupported and will be removed -* 4.3.0: Unsused UserBlocked exception will be removed +* 4.3.0: Unused UserBlocked exception will be removed * 4.3.0: Deprecated Page.contributingUsers() will be removed * 4.2.0: tools.StringTypes will be removed * 4.1.0: Deprecated editor.command will be removed -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/635010 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: Ie9b3d34cd0f12b9e565f4986faf84961cdeb4394 Gerrit-Change-Number: 635010 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]: [5.0.1] Prepare next release
by jenkins-bot (Code Review) 19 Oct '20

19 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634996 ) Change subject: [5.0.1] Prepare next release ...................................................................... [5.0.1] Prepare next release Change-Id: I02100dd9c7ec3bf09d964707e67953b0d52e78ea --- M HISTORY.rst M ROADMAP.rst M pywikibot/__metadata__.py 3 files changed, 52 insertions(+), 44 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index c781cc0..efd7f1e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,56 @@ Release history =============== +5.0.0 +----- + +*19 October 2020* + +* callback parameter of comms.http.fetch() is desupported +* Fix api.APIError() calls for Flow and Thanks extension +* edit, move, create, upload, unprotect and prompt parameters of Page.protect() are deprecated (T227610) +* Accept only valid names in generate_family_file.py (T265328, T265353) +* New plural.plural_rule() function returns a rule for a given language +* Replace deprecated urllib.request.URLopener with http.fetch (T255575) +* OptionHandler/BaseBot options are accessable as OptionHandler.opt attributes or keyword item (see also T264721) +* pywikibot.setAction() function was removed +* A namedtuple is the result of textlib.extract_sections() +* Prevent circular imports in config2.py and http.py (T264500) +* version.get_module_version() is deprecated and gives no meaningfull result +* Fix version.get_module_filename() and update log lines (T264235) +* Re-enable printing log header (T264235) +* Fix result of tools.intersect_generators() (T263947) +* Only show _GLOBAL_HELP options if explicitly wanted +* Deprecated Family.version() methods were removed +* Unused parameters of page methods like forceReload, insite, throttle, step was removed +* Raise RuntimeError instead of AttributeError for old wikis (T263951) +* Deprecated script options were removed +* lyricwiki_family was removed (T245439) +* RecentChangesPageGenerator parameters has been synced with APISite.recentchanges +* APISite.recentchanges accepts keyword parameters only +* LoginStatus enum class was moved from site to login.py +* WbRepresentation derives from abstract base class abc.ABC +* Update characters in the Cf category to Unicode version 12.1.0 +* Update __all__ variable in pywikibot (T122879) +* Use api.APIGenerator through site._generator (T129013) +* Support of MediaWiki releases below 1.19 has been dropped (T245350) +* Page.get_best_claim () retrieves preferred Claim of a property referring to the given page (T175207) +* Check whether _putthead is current_thread() to join() (T263331) +* Add BasePage.has_deleted_revisions() method +* Allow querying deleted revs without the deletedhistory right +* Use ignore_discard for login cookie container (T261066) +* Siteinfo.get() loads data via API instead from cache if expiry parameter is True (T260490) +* Move latest revision id handling to WikibaseEntity (T233406) +* Load wikibase entities when necessary (T245809) +* Fix path for stable release in version.getversion() (T262558) +* "since" parameter in EventStreams given as Timestamp or MediaWiki timestamp string has been fixed +* Methods deprecated for 6 years or longer were removed +* Page.getVersionHistory and Page.fullVersionHistory() methods were removed (T136513, T151110) +* Allow multiple types of contributors parameter given for Page.revision_count() +* Deprecated tools.UnicodeMixin and tools.IteratorNextMixin has been removed +* Localisation updates + + 4.3.0 ----- diff --git a/ROADMAP.rst b/ROADMAP.rst index e0879cc..559a49f 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,49 +1,7 @@ Current release changes ~~~~~~~~~~~~~~~~~~~~~~~ -* callback parameter of comms.http.fetch() is desupported -* Fix api.APIError() calls for Flow and Thanks extension -* edit, move, create, upload, unprotect and prompt parameters of Page.protect() are deprecated (T227610) -* Accept only valid names in generate_family_file.py (T265328, T265353) -* New plural.plural_rule() function returns a rule for a given language -* Replace deprecated urllib.request.URLopener with http.fetch (T255575) -* OptionHandler/BaseBot options are accessable as OptionHandler.opt attributes or keyword item (see also T264721) -* pywikibot.setAction() function was removed -* A namedtuple is the result of textlib.extract_sections() -* Prevent circular imports in config2.py and http.py (T264500) -* version.get_module_version() is deprecated and gives no meaningfull result -* Fix version.get_module_filename() and update log lines (T264235) -* Re-enable printing log header (T264235) -* Fix result of tools.intersect_generators() (T263947) -* Only show _GLOBAL_HELP options if explicitly wanted -* Deprecated Family.version() methods were removed -* Unused parameters of page methods like forceReload, insite, throttle, step was removed -* Raise RuntimeError instead of AttributeError for old wikis (T263951) -* Deprecated script options were removed -* lyricwiki_family was removed (T245439) -* RecentChangesPageGenerator parameters has been synced with APISite.recentchanges -* APISite.recentchanges accepts keyword parameters only -* LoginStatus enum class was moved from site to login.py -* WbRepresentation derives from abstract base class abc.ABC -* Update characters in the Cf category to Unicode version 12.1.0 -* Update __all__ variable in pywikibot (T122879) -* Use api.APIGenerator through site._generator (T129013) -* Support of MediaWiki releases below 1.19 has been dropped (T245350) -* Page.get_best_claim () retrieves preferred Claim of a property referring to the given page (T175207) -* Check whether _putthead is current_thread() to join() (T263331) -* Add BasePage.has_deleted_revisions() method -* Allow querying deleted revs without the deletedhistory right -* Use ignore_discard for login cookie container (T261066) -* Siteinfo.get() loads data via API instead from cache if expiry parameter is True (T260490) -* Move latest revision id handling to WikibaseEntity (T233406) -* Load wikibase entities when necessary (T245809) -* Fix path for stable release in version.getversion() (T262558) -* "since" parameter in EventStreams given as Timestamp or MediaWiki timestamp string has been fixed -* Methods deprecated for 6 years or longer were removed -* Page.getVersionHistory and Page.fullVersionHistory() methods were removed (T136513, T151110) -* Allow multiple types of contributors parameter given for Page.revision_count() -* Deprecated tools.UnicodeMixin and tools.IteratorNextMixin has been removed -* Localisation updates +* (no changes yet) Future release notes diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index ebe7d67..65aac0a 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -6,7 +6,7 @@ # Distributed under the terms of the MIT license. # __name__ = 'pywikibot' -__version__ = '5.0.0' +__version__ = '5.0.1.dev0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634996 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: I02100dd9c7ec3bf09d964707e67953b0d52e78ea Gerrit-Change-Number: 634996 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[stable]: [5.0.0] Merge branch 'master' into stable
by jenkins-bot (Code Review) 19 Oct '20

19 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634995 ) Change subject: [5.0.0] Merge branch 'master' into stable ...................................................................... [5.0.0] Merge branch 'master' into stable Change-Id: Ieaec9de39928b8b5b093baa80e873145fcde85c7 --- 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634995 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: Ieaec9de39928b8b5b093baa80e873145fcde85c7 Gerrit-Change-Number: 634995 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]: [5.0] Publish Pywikibot release 5.0.0
by Xqt (Code Review) 19 Oct '20

19 Oct '20

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634993 ) Change subject: [5.0] Publish Pywikibot release 5.0.0 ...................................................................... [5.0] Publish Pywikibot release 5.0.0 Change-Id: I18927683d56f9f1f4c14b6e0a07b7b984aebfe82 --- M pywikibot/__metadata__.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 87993f2..ebe7d67 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -6,7 +6,7 @@ # Distributed under the terms of the MIT license. # __name__ = 'pywikibot' -__version__ = '5.0.0.dev0' +__version__ = '5.0.0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634993 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: I18927683d56f9f1f4c14b6e0a07b7b984aebfe82 Gerrit-Change-Number: 634993 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]: [doc] Update ROADMAP.rst
by Xqt (Code Review) 19 Oct '20

19 Oct '20

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634480 ) Change subject: [doc] Update ROADMAP.rst ...................................................................... [doc] Update ROADMAP.rst Change-Id: I5db964593af609c6c4b49986abc336bb04bfb783 --- M ROADMAP.rst 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index 046e370..e0879cc 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,6 +1,12 @@ Current release changes ~~~~~~~~~~~~~~~~~~~~~~~ +* callback parameter of comms.http.fetch() is desupported +* Fix api.APIError() calls for Flow and Thanks extension +* edit, move, create, upload, unprotect and prompt parameters of Page.protect() are deprecated (T227610) +* Accept only valid names in generate_family_file.py (T265328, T265353) +* New plural.plural_rule() function returns a rule for a given language +* Replace deprecated urllib.request.URLopener with http.fetch (T255575) * OptionHandler/BaseBot options are accessable as OptionHandler.opt attributes or keyword item (see also T264721) * pywikibot.setAction() function was removed * A namedtuple is the result of textlib.extract_sections() @@ -43,6 +49,9 @@ Future release notes ~~~~~~~~~~~~~~~~~~~~ +* 5.0.0: PageRelatedError.getPage() will be removes in favour of PageRelatedError.page +* 5.0.0: HttpRequest result of http.fetch() will be replaced by requests.Response (T265206) +* 5.0.0: edit, move, create, upload, unprotect and prompt parameters of Page.protect() will be removed (T227610) * 5.0.0: OptionHandler.options dict will be removed in favour of OptionHandler.opt * 5.0.0: version.getfileversion() is desupported and will be removed * 5.0.0: Methods deprecated for 5 years or longer will be removed -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634480 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: I5db964593af609c6c4b49986abc336bb04bfb783 Gerrit-Change-Number: 634480 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]: [L10N] Add support for smn site
by jenkins-bot (Code Review) 19 Oct '20

19 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634986 ) Change subject: [L10N] Add support for smn site ...................................................................... [L10N] Add support for smn site - update family files - update linktrail - check sorting order - fix wikimedia_sites.py script Bug: T264962 Change-Id: If96f3916db41191bbf27c7aa7a33012045f8afda --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wiktionary_family.py M pywikibot/family.py M scripts/maintenance/wikimedia_sites.py 8 files changed, 29 insertions(+), 28 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 71a391b..7e2338a 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -36,7 +36,7 @@ 'uk', 'eo', 'sk', 'is', 'ro', 'bn', 'si', 'mk', 'ka', 'bg', 'ms', 'tt', 'lt', 'el', 'li', 'ur', 'sl', 'km', 'tl', 'la', 'et', 'be', 'kk', 'ia', 'ml', 'oc', 'ne', 'hy', 'tg', 'cv', 'pa', 'te', 'ku', 'fy', 'bs', 'cy', - 'af', 'mr', 'mg', 'ky', + 'af', 'mg', 'mr', 'ky', ] category_redirect_templates = { diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index c6b32b6..b75d78c 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,34 +30,34 @@ languages_by_size = [ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'it', 'es', 'pl', 'war', 'vi', 'ja', 'zh', 'arz', 'ar', 'uk', 'pt', 'fa', 'ca', 'sr', 'id', - 'no', 'ko', 'fi', 'hu', 'cs', 'sh', 'ro', 'zh-min-nan', 'tr', 'eu', + 'no', 'ko', 'fi', 'hu', 'cs', 'sh', 'zh-min-nan', 'ro', 'tr', 'eu', 'ms', 'ce', 'eo', 'he', 'hy', 'bg', 'da', 'azb', 'sk', 'kk', 'min', - 'hr', 'et', 'lt', 'be', 'el', 'simple', 'az', 'sl', 'gl', 'ur', 'nn', - 'tt', 'ka', 'hi', 'th', 'uz', 'la', 'cy', 'ta', 'vo', 'mk', 'ast', + 'hr', 'et', 'lt', 'be', 'el', 'simple', 'az', 'tt', 'sl', 'gl', 'ur', + 'nn', 'ka', 'hi', 'th', 'uz', 'la', 'cy', 'ta', 'vo', 'mk', 'ast', 'lv', 'zh-yue', 'tg', 'bn', 'af', 'mg', 'oc', 'bs', 'sq', 'ky', 'nds', 'new', 'be-tarask', 'ml', 'te', 'br', 'tl', 'vec', 'pms', 'mr', 'su', 'ht', 'sw', 'lb', 'jv', 'pnb', 'ba', 'ga', 'szl', 'is', 'my', 'fy', - 'cv', 'lmo', 'sco', 'wuu', 'an', 'pa', 'diq', 'ne', 'ku', 'yo', 'bar', + 'cv', 'lmo', 'sco', 'wuu', 'an', 'diq', 'pa', 'ku', 'ne', 'yo', 'bar', 'io', 'gu', 'ckb', 'als', 'kn', 'scn', 'bpy', 'qu', 'ia', 'mn', 'bat-smg', 'si', 'nv', 'or', 'cdo', 'ilo', 'gd', 'xmf', 'yi', 'am', 'nap', 'bug', 'wa', 'sd', 'hsb', 'mai', 'fo', 'map-bms', 'mzn', 'li', 'sah', 'eml', 'os', 'ps', 'sa', 'frr', 'bcl', 'zh-classical', 'ace', - 'mrj', 'mhr', 'avk', 'hif', 'gor', 'hak', 'roa-tara', 'pam', 'hyw', - 'km', 'nso', 'rue', 'crh', 'se', 'bh', 'as', 'shn', 'vls', 'mi', - 'nds-nl', 'nah', 'sc', 'vep', 'gan', 'myv', 'sn', 'ab', 'glk', 'bo', - 'lrc', 'so', 'co', 'tk', 'fiu-vro', 'ha', 'csb', 'kv', 'ie', 'gv', + 'mrj', 'mhr', 'avk', 'gor', 'hif', 'hak', 'roa-tara', 'pam', 'hyw', + 'km', 'nso', 'rue', 'crh', 'se', 'as', 'bh', 'shn', 'vls', 'mi', + 'nds-nl', 'nah', 'sc', 'vep', 'gan', 'myv', 'sn', 'ab', 'glk', 'lrc', + 'bo', 'so', 'co', 'tk', 'fiu-vro', 'ha', 'csb', 'kv', 'ie', 'gv', 'udm', 'pcd', 'ay', 'kab', 'zea', 'sat', 'nrm', 'zu', 'ug', 'lij', - 'kw', 'ban', 'frp', 'lez', 'stq', 'lfn', 'gn', 'mwl', 'gom', 'rm', - 'mt', 'lo', 'lad', 'koi', 'fur', 'olo', 'ang', 'dty', 'dsb', 'bjn', + 'kw', 'ban', 'frp', 'lez', 'lfn', 'stq', 'gn', 'mwl', 'gom', 'rm', + 'mt', 'lo', 'lad', 'koi', 'olo', 'fur', 'ang', 'dty', 'dsb', 'bjn', 'ext', 'ln', 'cbk-zam', 'dv', 'ksh', 'tyv', 'ary', 'gag', 'pfl', 'pag', - 'pi', 'av', 'awa', 'haw', 'bxr', 'xal', 'krc', 'pap', 'za', 'pdc', - 'rw', 'kaa', 'szy', 'arc', 'to', 'nov', 'jam', 'tpi', 'kbp', 'kbd', - 'ig', 'inh', 'na', 'tet', 'wo', 'tcy', 'ki', 'atj', 'jbo', 'roa-rup', - 'bi', 'lbe', 'kg', 'ty', 'lg', 'mdf', 'fj', 'srn', 'xh', 'lld', 'gcr', - 'ltg', 'ak', 'chr', 'om', 'sm', 'kl', 'got', 'pih', 'st', 'cu', 'nqo', - 'ny', 'tn', 'tw', 'ts', 'rmy', 'bm', 'mnw', 'chy', 'rn', 'tum', 'ss', - 'ch', 'iu', 'pnt', 'ks', 'ady', 've', 'ee', 'ik', 'ff', 'sg', 'dz', - 'ti', 'cr', 'din', + 'pi', 'av', 'awa', 'haw', 'bxr', 'xal', 'krc', 'pap', 'za', 'rw', + 'pdc', 'kaa', 'ak', 'szy', 'arc', 'to', 'nov', 'jam', 'tpi', 'kbp', + 'kbd', 'ig', 'inh', 'na', 'tet', 'wo', 'tcy', 'ki', 'lld', 'atj', + 'jbo', 'bi', 'roa-rup', 'lbe', 'kg', 'ty', 'lg', 'mdf', 'fj', 'srn', + 'xh', 'gcr', 'ltg', 'chr', 'sm', 'om', 'kl', 'got', 'pih', 'st', 'ny', + 'cu', 'nqo', 'tn', 'tw', 'ts', 'mnw', 'rmy', 'bm', 'chy', 'rn', 'tum', + 'ss', 'ch', 'iu', 'pnt', 'ks', 'ady', 've', 'ee', 'ik', 'ff', 'sg', + 'din', 'dz', 'ti', 'cr', 'smn', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 7f0df5a..5259ea4 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -29,8 +29,8 @@ languages_by_size = [ 'en', 'it', 'pl', 'ru', 'cs', 'fa', 'de', 'pt', 'es', 'fr', 'uk', 'he', - 'sk', 'bs', 'tr', 'ca', 'fi', 'az', 'sl', 'lt', 'eo', 'zh', 'bg', 'ar', - 'hr', 'hy', 'et', 'el', 'su', 'nn', 'id', 'sv', 'li', 'hu', 'ko', 'nl', + 'sk', 'bs', 'tr', 'ca', 'fi', 'az', 'sl', 'lt', 'eo', 'zh', 'bg', 'et', + 'ar', 'hr', 'hy', 'el', 'su', 'nn', 'id', 'sv', 'li', 'hu', 'ko', 'nl', 'ja', 'la', 'ta', 'sah', 'sr', 'gu', 'gl', 'th', 'ur', 'te', 'be', 'cy', 'no', 'ml', 'sq', 'kn', 'ro', 'ku', 'eu', 'uz', 'hi', 'ka', 'da', 'sa', 'is', 'vi', 'br', 'mr', 'af', 'wo', 'ky', diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index ff35d53..0c4afe6 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -27,10 +27,10 @@ languages_by_size = [ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'uk', 'cs', - 'mul', 'pt', 'gu', 'sr', 'fa', 'hu', 'sv', 'ml', 'ko', 'bn', 'sa', - 'sl', 'hy', 'te', 'ta', 'el', 'ro', 'fi', 'ja', 'th', 'nap', 'vi', + 'mul', 'gu', 'pt', 'sr', 'fa', 'hu', 'sv', 'ml', 'ko', 'bn', 'sa', + 'sl', 'te', 'hy', 'ta', 'el', 'ro', 'fi', 'ja', 'th', 'nap', 'vi', 'tr', 'az', 'br', 'la', 'ca', 'nl', 'kn', 'hr', 'eo', 'no', 'is', - 'vec', 'pms', 'et', 'be', 'id', 'da', 'mk', 'lij', 'hi', 'yi', 'mr', + 'vec', 'pms', 'et', 'be', 'id', 'da', 'lij', 'mk', 'hi', 'yi', 'mr', 'bg', 'as', 'li', 'lt', 'eu', 'or', 'pa', 'gl', 'bs', 'sah', 'sk', 'cy', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index be5df39..5ad7a75 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -17,7 +17,7 @@ name = 'wikiversity' languages_by_size = [ - 'de', 'en', 'fr', 'zh', 'ru', 'it', 'cs', 'pt', 'es', 'sv', 'sl', 'fi', + 'de', 'en', 'fr', 'zh', 'ru', 'it', 'cs', 'pt', 'es', 'sl', 'sv', 'fi', 'ar', 'el', 'hi', 'ko', 'ja', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 3ee016b..7b67d0f 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -29,8 +29,8 @@ ] languages_by_size = [ - 'en', 'mg', 'fr', 'ru', 'de', 'sh', 'es', 'zh', 'ku', 'el', 'nl', 'sv', - 'pl', 'lt', 'it', 'ca', 'fi', 'ta', 'hu', 'tr', 'hy', 'io', 'ko', 'kn', + 'en', 'mg', 'fr', 'ru', 'de', 'sh', 'es', 'zh', 'el', 'nl', 'sv', 'pl', + 'ku', 'lt', 'it', 'ca', 'fi', 'ta', 'hu', 'tr', 'hy', 'io', 'ko', 'kn', 'pt', 'ja', 'vi', 'sr', 'th', 'chr', 'hi', 'ro', 'no', 'et', 'id', 'ml', 'cs', 'my', 'uz', 'li', 'or', 'te', 'eo', 'fa', 'ar', 'gl', 'jv', 'az', 'oc', 'eu', 'uk', 'br', 'da', 'lo', 'hr', 'is', 'simple', 'ast', diff --git a/pywikibot/family.py b/pywikibot/family.py index 1aea0c0..b82167b 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -317,6 +317,7 @@ 'sh': '[a-zčćđžš]*', 'sk': '[a-záäčďéíľĺňóôŕšťúýž]*', 'sl': '[a-zčćđžš]*', + 'smn': '[a-zâčđŋšžäá]*', 'sr': '[abvgdđežzijklljmnnjoprstćufhcčdž' 'šабвгдђежзијклљмнњопрстћуфхцчџш]*', 'srn': '[a-zäöüïëéèà]*', diff --git a/scripts/maintenance/wikimedia_sites.py b/scripts/maintenance/wikimedia_sites.py index 0ccc6c0..12b0e18 100755 --- a/scripts/maintenance/wikimedia_sites.py +++ b/scripts/maintenance/wikimedia_sites.py @@ -70,7 +70,7 @@ if original == new: pywikibot.output('The lists match!') - return + continue pywikibot.output("The lists don't match, the new list is:") text = ' languages_by_size = [\n' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634986 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: If96f3916db41191bbf27c7aa7a33012045f8afda Gerrit-Change-Number: 634986 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 19 Oct '20

19 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/634960 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I794bde2ee12a5f6214c5c6a105e5610be42d6348 --- M solve_disambiguation/nl.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/solve_disambiguation/nl.json b/solve_disambiguation/nl.json index d7627c2..a79d4aa 100644 --- a/solve_disambiguation/nl.json +++ b/solve_disambiguation/nl.json @@ -1,12 +1,13 @@ { "@metadata": { "authors": [ + "Aranka", "MuratTheTurkish", "Siebrand" ] }, "solve_disambiguation-adding-dn-template": "Robotgeholpen disambiguatie: %(from)s - heeft aandacht van een expert nodig", - "solve_disambiguation-links-removed": "Robotgeholpen doorverwijzing: %(from)s - Koppeling(en) verwijderd", + "solve_disambiguation-links-removed": "Robotgeholpen doorverwijzing: %(from)s - Koppeling(en) verwijderd.", "solve_disambiguation-links-resolved": "Robotgeholpen doorverwijzing: %(from)s - Koppeling(en) gewijzigd naar %(to)s", "solve_disambiguation-redirect-adding-dn-template": "Robotgeholpen disambiguatie: %(from)s - heeft aandacht van een expert nodig", "solve_disambiguation-redirect-removed": "Robotgeholpen oplossing voor doorverwijzing: %(from)s - Koppeling(en) verwijderd", -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/634960 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I794bde2ee12a5f6214c5c6a105e5610be42d6348 Gerrit-Change-Number: 634960 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] remove callback param from fetch and simplify
by jenkins-bot (Code Review) 19 Oct '20

19 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634832 ) Change subject: [IMPR] remove callback param from fetch and simplify ...................................................................... [IMPR] remove callback param from fetch and simplify Remove callback parameter from fetch(). All callbacks shall be added in callbacks param. Simplify code complexity of user_agent(). Change-Id: I9ba258672aa86984bd61da218e85548164cfc41b --- M pywikibot/comms/http.py 1 file changed, 18 insertions(+), 18 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index fc201d7..e1d28b0 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -153,6 +153,12 @@ username = '' if config.user_agent_description: script_comments.append(config.user_agent_description) + + values['family'] = '' + values['code'] = '' + values['lang'] = '' # TODO: use site.lang, if known + values['site'] = '' + if site: script_comments.append(str(site)) @@ -160,20 +166,19 @@ # is not the best for a HTTP header if the username isn't ASCII. if site.username(): username = user_agent_username(site.username()) - script_comments.append( - 'User:' + username) + script_comments.append('User:' + username) - values.update({ - 'family': site.family.name if site else '', - 'code': site.code if site else '', - 'lang': site.code if site else '', # TODO: use site.lang, if known - 'site': str(site) if site else '', - 'username': username, - 'script_comments': '; '.join(script_comments) - }) + values.update({ + 'family': site.family.name, + 'code': site.code, + 'lang': site.code, # TODO: use site.lang, if known + 'site': str(site), + }) - if not format_string: - format_string = config.user_agent_format + values['username'] = username + values['script_comments'] = '; '.join(script_comments) + + format_string = format_string or config.user_agent_format formatted = _USER_AGENT_FORMATTER.format(format_string, **values) # clean up after any blank components @@ -410,6 +415,7 @@ return request +@deprecate_arg('callback', True) def fetch(uri, method='GET', params=None, body=None, headers=None, default_error_handling: bool = True, use_fake_user_agent: Union[bool, str] = False, @@ -430,8 +436,6 @@ @type charset: CodecInfo, str, None @kwarg disable_ssl_certificate_validation: diable SSL Verification @type disable_ssl_certificate_validation: bool - @kwarg callback: Method to call once data is fetched - @type callback: callable @kwarg callbacks: Methods to call once data is fetched @type callbacks: list of callable @rtype: L{threadedhttp.HttpRequest} @@ -463,10 +467,6 @@ headers['user-agent'] = fake_user_agent() callbacks = kwargs.pop('callbacks', []) - callback = kwargs.pop('callback', None) - if callback: - callbacks.append(callback) - if default_error_handling: callbacks.append(error_handling_callback) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634832 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: I9ba258672aa86984bd61da218e85548164cfc41b Gerrit-Change-Number: 634832 Gerrit-PatchSet: 3 Gerrit-Owner: 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]: [IMPR] Reduce code complexity of HttpRequest.header_encoding()
by jenkins-bot (Code Review) 18 Oct '20

18 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634834 ) Change subject: [IMPR] Reduce code complexity of HttpRequest.header_encoding() ...................................................................... [IMPR] Reduce code complexity of HttpRequest.header_encoding() Change-Id: Ie00cc6bba6b6f1edf02cb22a41387014206bb033 --- M pywikibot/comms/threadedhttp.py 1 file changed, 20 insertions(+), 19 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 8b4338e..208dc8e 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -108,26 +108,27 @@ @property def header_encoding(self): """Return charset given by the response header.""" - if not hasattr(self, '_header_encoding'): - content_type = self.response_headers.get('content-type', '') - pos = content_type.find('charset=') - if pos >= 0: - pos += len('charset=') - encoding = self.response_headers['content-type'][pos:] - self._header_encoding = encoding - elif 'json' in content_type: - # application/json | application/sparql-results+json - self._header_encoding = 'utf-8' - elif 'xml' in content_type: - header = self.raw[:100].splitlines()[0] # bytes - m = re.search( - br'encoding=(["\'])(?P<encoding>.+?)\1', header) - if m: - self._header_encoding = m.group('encoding').decode('utf-8') - else: - self._header_encoding = 'utf-8' + if hasattr(self, '_header_encoding'): + return self._header_encoding + + content_type = self.response_headers.get('content-type', '') + m = re.search('charset=(?P<charset>.*?$)', content_type) + if m: + self._header_encoding = m.group('charset') + elif 'json' in content_type: + # application/json | application/sparql-results+json + self._header_encoding = 'utf-8' + elif 'xml' in content_type: + header = self.raw[:100].splitlines()[0] # bytes + m = re.search( + br'encoding=(["\'])(?P<encoding>.+?)\1', header) + if m: + self._header_encoding = m.group('encoding').decode('utf-8') else: - self._header_encoding = None + self._header_encoding = 'utf-8' + else: + self._header_encoding = None + return self._header_encoding @property -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634834 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: Ie00cc6bba6b6f1edf02cb22a41387014206bb033 Gerrit-Change-Number: 634834 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
19
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2020