jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/769295 )
Change subject: Revert "[cleanup] no longer use win32_unicode for Python 3.6+"
......................................................................
Revert "[cleanup] no longer use win32_unicode for Python 3.6+"
This reverts commit 65862799dd66c25eb24720e75365ee6095603108.
Reason for revert: T303382
Bug: T303382
Change-Id: I2b34db6daf83c0504557ba26b0ce026e9891e5f7
---
M pywikibot/userinterfaces/terminal_interface_win32.py
1 file changed, 8 insertions(+), 11 deletions(-)
Approvals:
Xqt: 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 9db1fac..05b62eb 100755
--- a/pywikibot/userinterfaces/terminal_interface_win32.py
+++ b/pywikibot/userinterfaces/terminal_interface_win32.py
@@ -1,13 +1,12 @@
"""User interface for Win32 terminals."""
#
-# (C) Pywikibot team, 2003-2022
+# (C) Pywikibot team, 2003-2020
#
# Distributed under the terms of the MIT license.
#
import ctypes
-from pywikibot.tools import PYTHON_VERSION
-from pywikibot.userinterfaces import terminal_interface_base
+from pywikibot.userinterfaces import terminal_interface_base, win32_unicode
windowsColors = {
@@ -38,14 +37,12 @@
def __init__(self):
"""Initializer."""
super().__init__()
- if PYTHON_VERSION == (3, 5): # issue1602 solved in Python 3.6
- from pywikibot.userinterfaces import win32_unicode
- stdin, stdout, stderr, argv = win32_unicode.get_unicode_console()
- self.stdin = stdin
- self.stdout = stdout
- self.stderr = stderr
- self.argv = argv
- self.encoding = 'utf-8'
+ (stdin, stdout, stderr, argv) = win32_unicode.get_unicode_console()
+ self.stdin = stdin
+ self.stdout = stdout
+ self.stderr = stderr
+ self.argv = argv
+ self.encoding = 'utf-8'
def support_color(self, target_stream):
"""Return whether the target stream supports actually color."""
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/769295
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: I2b34db6daf83c0504557ba26b0ce026e9891e5f7
Gerrit-Change-Number: 769295
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
