jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Win32 UI: Explicitly use bytes in Python 2
......................................................................
[FIX] Win32 UI: Explicitly use bytes in Python 2
When searching for a unicode via 'in' in bytes it'll try decoding the
bytes which might fail if it doesn't contain ASCII characters.
Bug: T95671
Change-Id: I5ecf0539b4b056ba14a59fcce4cce595815c2ff7
---
M pywikibot/userinterfaces/terminal_interface_win32.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py
b/pywikibot/userinterfaces/terminal_interface_win32.py
index ddef65f..d4f2c1f 100755
--- a/pywikibot/userinterfaces/terminal_interface_win32.py
+++ b/pywikibot/userinterfaces/terminal_interface_win32.py
@@ -102,7 +102,9 @@
def _raw_input(self):
data = self.stdin.readline()
- if '\x1a' in data:
+ # data is in both Python versions str but '\x1a' is unicode in Python 2
+ # so explicitly convert into str as it otherwise tries to decode data
+ if str('\x1a') in data:
raise EOFError()
return data.strip()
--
To view, visit https://gerrit.wikimedia.org/r/203346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ecf0539b4b056ba14a59fcce4cce595815c2ff7
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: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
