floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terminalwriter: remove support for passing callable as file in TerminalWriter 

Not used.
This commit is contained in:
Ran Benita 2020-04-29 15:57:21 +03:00
parent 0528307ebf
commit dac05ccd9a
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/_pytest/_io/terminalwriter.py
View File

@ -83,17 +83,14 @@ class TerminalWriter:
)
# XXX deprecate stringio argument
def __init__(self, file=None, stringio=False, encoding=None):
def __init__(self, file=None, stringio=False):
if file is None:
if stringio:
self.stringio = file = StringIO()
else:
from sys import stdout as file
elif callable(file) and not (hasattr(file, "write") and hasattr(file, "flush")):
file = WriteFile(file, encoding=encoding)
if hasattr(file, "isatty") and file.isatty() and colorama:
file = colorama.AnsiToWin32(file).stream
self.encoding = encoding or getattr(file, "encoding", "utf-8")
self._file = file
self.hasmarkup = should_do_markup(file)
self._chars_on_current_line = 0
@ -195,20 +192,6 @@ class TerminalWriter:
self.write("\n")
class WriteFile:
def __init__(self, writemethod, encoding=None):
self.encoding = encoding
self._writemethod = writemethod
def write(self, data):
if self.encoding:
data = data.encode(self.encoding, "replace")
self._writemethod(data)
def flush(self):
return
if win32_and_ctypes:
import ctypes # noqa: F811
from ctypes import wintypes