jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/910826 )
Change subject: [bugfix] Fix url2string parsing for multiple encodings
......................................................................
[bugfix] Fix url2string parsing for multiple encodings
Bug: T335224
Change-Id: I64305e958558645a74353c7cdfe090e8751d00ae
---
M pywikibot/tools/chars.py
1 file changed, 23 insertions(+), 1 deletion(-)
Approvals:
Matěj Suchánek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/tools/chars.py b/pywikibot/tools/chars.py
index 6421628..f4d7a95 100644
--- a/pywikibot/tools/chars.py
+++ b/pywikibot/tools/chars.py
@@ -100,10 +100,21 @@
Uses the first encoding that doesn't cause an error.
+ **Example:**
+ >>> url2string('/El%20Ni%C3%B1o/')
+ '/El Niño/'
+ >>> url2string('/El%20Ni%C3%B1o/', 'ascii')
+ Traceback (most recent call last):
+ ...
+ UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 6:...
+ >>> url2string('/El%20Ni%C3%B1o/', ['ascii', 'utf-8'])
+ '/El Niño/'
+
:param title: URL-encoded character data to convert
:param encodings: Encodings to attempt to use during conversion.
:raise UnicodeError: Could not convert using any encoding.
+ :raise LookupError: unknown encoding
"""
if isinstance(encodings, str):
encodings = [encodings]
@@ -113,11 +124,12 @@
try:
t = title.encode(enc)
t = unquote_to_bytes(t)
+ result = t.decode(enc)
except UnicodeError as e:
if not first_exception:
first_exception = e
else:
- return t.decode(enc)
+ return result
# Couldn't convert, raise the first exception
raise first_exception
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/910826
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: I64305e958558645a74353c7cdfe090e8751d00ae
Gerrit-Change-Number: 910826
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Matěj Suchánek <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
