jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634932 )
Change subject: [IMPR] reduce code complexity of HttpRequest.encoding()
......................................................................
[IMPR] reduce code complexity of HttpRequest.encoding()
Change-Id: I2cf45c9cde86469b363a5835bb09bbed6f8b50d5
---
M pywikibot/comms/threadedhttp.py
1 file changed, 26 insertions(+), 24 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py
index 208dc8e..d6b98b3 100644
--- a/pywikibot/comms/threadedhttp.py
+++ b/pywikibot/comms/threadedhttp.py
@@ -134,34 +134,36 @@
@property
def encoding(self):
"""Detect the response encoding."""
- if not hasattr(self, '_encoding'):
- if self.charset is None and self.header_encoding is None:
- pywikibot.log("Http response doesn't contain a charset.")
- charset = 'latin1'
- else:
- charset = self.charset
+ if hasattr(self, '_encoding'):
+ return self._encoding
- if self.header_encoding is not None \
- and (charset is None
- or codecs.lookup(self.header_encoding)
- != codecs.lookup(charset)):
- if charset:
- pywikibot.warning(
- 'Encoding "{}" requested but "{}"
received in the '
- 'header.'.format(charset, self.header_encoding))
+ if self.charset is None and self.header_encoding is None:
+ pywikibot.log("Http response doesn't contain a charset.")
+ charset = 'latin1'
+ else:
+ charset = self.charset
- # TODO: Buffer decoded content, weakref does remove it too
- # early (directly after this method)
- self._encoding = self._try_decode(self.header_encoding)
- else:
- self._encoding = None
+ _encoding = UnicodeError()
+ if self.header_encoding is not None \
+ and (charset is None
+ or codecs.lookup(self.header_encoding)
+ != codecs.lookup(charset)):
+ if charset:
+ pywikibot.warning(
+ 'Encoding "{}" requested but "{}" received in
the '
+ 'header.'.format(charset, self.header_encoding))
- if charset and (isinstance(self._encoding, Exception)
- or self._encoding is None):
- self._encoding = self._try_decode(charset)
+ # TODO: Buffer decoded content, weakref does remove it too
+ # early (directly after this method)
+ _encoding = self._try_decode(self.header_encoding)
- if isinstance(self._encoding, Exception):
- raise self._encoding
+ if charset and isinstance(_encoding, Exception):
+ _encoding = self._try_decode(charset)
+
+ if isinstance(_encoding, Exception):
+ raise _encoding
+ else:
+ self._encoding = _encoding
return self._encoding
def _try_decode(self, encoding):
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634932
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: I2cf45c9cde86469b363a5835bb09bbed6f8b50d5
Gerrit-Change-Number: 634932
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