ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix display when run through a testing framework that overrides stderr/stdout

Browse source
This commit is contained in:
Toshio Kuratomi 2015-10-12 10:05:19 -07:00
parent d15fcf05f0
commit b441bcb678
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/utils/display.py
View file

@ -26,6 +26,7 @@ import random
import subprocess import subprocess
import sys import sys
import time import time
import locale
import logging import logging
import getpass import getpass
from struct import unpack, pack from struct import unpack, pack
@ -267,9 +268,13 @@ class Display:
@staticmethod @staticmethod
def _output_encoding(stderr=False): def _output_encoding(stderr=False):
if stderr: encoding = locale.getpreferredencoding()
return sys.stderr.encoding or 'utf-8' # https://bugs.python.org/issue6202
return sys.stdout.encoding or 'utf-8' # Python2 hardcodes an obsolete value on Mac. Use MacOSX defaults
# instead.
if encoding in ('mac-roman',):
encoding = 'utf-8'
return encoding
def _set_column_width(self): def _set_column_width(self):
if os.isatty(0): if os.isatty(0):