jenkins-bot has submitted this change and it was merged.
Change subject: Make argvu py3 compatible
......................................................................
Make argvu py3 compatible
Change-Id: Iff213b92ba7978da4d68daf42bf56d87023e771b
---
M pywikibot/userinterfaces/terminal_interface_base.py
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/userinterfaces/terminal_interface_base.py
b/pywikibot/userinterfaces/terminal_interface_base.py
index a5d6ecb..8f7ceb7 100755
--- a/pywikibot/userinterfaces/terminal_interface_base.py
+++ b/pywikibot/userinterfaces/terminal_interface_base.py
@@ -264,7 +264,10 @@
u'What is the solution of the CAPTCHA at this url ?')
def argvu(self):
- return [s.decode(self.encoding) for s in self.argv]
+ try:
+ return [s.decode(self.encoding) for s in self.argv]
+ except AttributeError: # in python 3, self.argv is unicode and thus cannot be
decoded
+ return [s for s in self.argv]
class TerminalHandler(logging.Handler):
--
To view, visit
https://gerrit.wikimedia.org/r/98288
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff213b92ba7978da4d68daf42bf56d87023e771b
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot