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

Apply readline workaround during initial conftest loading

This commit is contained in:
Bruno Oliveira 2015-12-25 17:46:19 -02:00
parent 6e170a4a1c
commit 57bc14caa0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/capture.py
View File

@ -31,6 +31,7 @@ def pytest_addoption(parser):
@pytest.hookimpl(hookwrapper=True) @pytest.hookimpl(hookwrapper=True)
def pytest_load_initial_conftests(early_config, parser, args): def pytest_load_initial_conftests(early_config, parser, args):
_readline_workaround()
ns = early_config.known_args_namespace ns = early_config.known_args_namespace
pluginmanager = early_config.pluginmanager pluginmanager = early_config.pluginmanager
capman = CaptureManager(ns.capture) capman = CaptureManager(ns.capture)
@ -307,8 +308,7 @@ class NoCapture:
class FDCapture: class FDCapture:
""" Capture IO to/from a given os-level filedescriptor. """ """ Capture IO to/from a given os-level filedescriptor. """
def __init__(self, targetfd, tmpfile=None): def __init__(self, targetfd, tmpfile=None):
readline_workaround()
self.targetfd = targetfd self.targetfd = targetfd
try: try:
self.targetfd_save = os.dup(self.targetfd) self.targetfd_save = os.dup(self.targetfd)
@ -445,7 +445,7 @@ class DontReadFromInput:
pass pass
def readline_workaround(): def _readline_workaround():
""" """
Ensure readline is imported so that it attaches to the correct stdio Ensure readline is imported so that it attaches to the correct stdio
handles on Windows. handles on Windows.
@ -464,6 +464,8 @@ def readline_workaround():
See https://github.com/pytest-dev/pytest/pull/1281 See https://github.com/pytest-dev/pytest/pull/1281
""" """
if not sys.platform.startswith('win32'):
return
try: try:
import readline # noqa import readline # noqa
except ImportError: except ImportError: