jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/491034 )
Change subject: [cleanup] Remove old py2.6 checking
......................................................................
[cleanup] Remove old py2.6 checking
Bug: T154771
Change-Id: I683c3e0adc3afd4c2493dece4efd5298d1c9a2b2
---
M pywikibot/userinterfaces/terminal_interface_unix.py
1 file changed, 8 insertions(+), 12 deletions(-)
Approvals:
Zhuyifei1999: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py
b/pywikibot/userinterfaces/terminal_interface_unix.py
index 9e06aa0..3225ed6 100755
--- a/pywikibot/userinterfaces/terminal_interface_unix.py
+++ b/pywikibot/userinterfaces/terminal_interface_unix.py
@@ -1,14 +1,15 @@
# -*- coding: utf-8 -*-
"""User interface for unix terminals."""
#
-# (C) Pywikibot team, 2003-2018
+# (C) Pywikibot team, 2003-2019
#
# Distributed under the terms of the MIT license.
#
from __future__ import absolute_import, division, unicode_literals
import re
-import sys
+
+from pywikibot.tools import PY2
from pywikibot.userinterfaces import terminal_interface_base
@@ -57,15 +58,10 @@
def _write(self, text, target_stream):
"""Optionally encode and write the text to the target
stream."""
- targetStream = target_stream
- if sys.version_info[0] == 2:
- # .encoding does not mean we can write unicode
- # to the stream pre-2.7.
- if (sys.version_info >= (2, 7)
- and hasattr(targetStream, 'encoding')
- and targetStream.encoding):
- text = text.encode(targetStream.encoding, 'replace').decode(
- targetStream.encoding)
+ if PY2:
+ encoding = getattr(target_stream, 'encoding', None)
+ if encoding:
+ text = text.encode(encoding, 'replace').decode(encoding)
else:
text = text.encode(self.encoding, 'replace')
- targetStream.write(text)
+ target_stream.write(text)
--
To view, visit
https://gerrit.wikimedia.org/r/491034
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I683c3e0adc3afd4c2493dece4efd5298d1c9a2b2
Gerrit-Change-Number: 491034
Gerrit-PatchSet: 4
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)