jenkins-bot has submitted this change and it was merged.
Change subject: [IMPROV] Use str.decode instead of unicode
......................................................................
[IMPROV] Use str.decode instead of unicode
With Python 3 unicode was removed. To support both versions 'unicode' is
aliased as 'str' in Python 3. But the usage of 'unicode(str, enc)' is
not necessary and instead 'str.decode(enc)' can be used (or to be exact
it's 'bytes' instead of 'str' in Python 3). Unfortunately this does not
remove the need for the 'unicode' alias, but reduces it a bit.
Change-Id: I7118142b7881821d78e4cb848116c4a2e5721c0a
---
M pywikibot/bot.py
M pywikibot/page.py
M pywikibot/pagegenerators.py
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Mpaa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 941f4b0..12a64fe 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -378,7 +378,7 @@
'newline': ("\n" if newline else "")}
if decoder:
- text = unicode(text, decoder)
+ text = text.decode(decoder)
elif not isinstance(text, unicode):
if not isinstance(text, str):
# looks like text is a non-text object.
@@ -387,9 +387,9 @@
text = unicode(text)
else:
try:
- text = unicode(text, 'utf-8')
+ text = text.decode('utf-8')
except UnicodeDecodeError:
- text = unicode(text, 'iso8859-1')
+ text = text.decode('iso8859-1')
logger.log(_level, text, extra=context, **kwargs)
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 70f8dd1..fa3158d 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -4510,7 +4510,7 @@
try:
t = title.encode(enc)
t = unquote_to_bytes(t)
- return unicode(t, enc)
+ return t.decode(enc)
except UnicodeError as ex:
if not firstException:
firstException = ex
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index c30c7ca..a57a22a 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -1483,7 +1483,7 @@
break
if pageName:
namespace = site.namespace(namespaceNumber)
- pageName = unicode(pageName, site.encoding())
+ pageName = pageName.decode(site.encoding())
if namespace:
pageTitle = '%s:%s' % (namespace, pageName)
else:
--
To view, visit https://gerrit.wikimedia.org/r/162563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7118142b7881821d78e4cb848116c4a2e5721c0a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Mpaa <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
