1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
--- contrib/python/pytest/py3/_pytest/debugging.py (index)
+++ contrib/python/pytest/py3/_pytest/debugging.py (working tree)
@@ -3,2 +3,3 @@ from __future__ import absolute_import
import functools
+import os
import sys
@@ -32,2 +33,38 @@ from _pytest import outcomes
+def import_readline():
+ try:
+ import readline
+ except ImportError:
+ sys.path.append('/usr/lib/python2.7/lib-dynload')
+
+ try:
+ import readline
+ except ImportError as e:
+ print('can not import readline:', e)
+
+ import subprocess
+ try:
+ subprocess.check_call('stty icrnl'.split())
+ except OSError as e:
+ print('can not restore Enter, use Control+J:', e)
+
+
+def tty():
+ if os.isatty(1):
+ return
+
+ fd = os.open('/dev/tty', os.O_RDWR)
+ os.dup2(fd, 0)
+ os.dup2(fd, 1)
+ os.dup2(fd, 2)
+ os.close(fd)
+
+ old_sys_path = sys.path
+ sys.path = list(sys.path)
+ try:
+ import_readline()
+ finally:
+ sys.path = old_sys_path
+
+
def _validate_usepdb_cls(value: str) -> Tuple[str, str]:
@@ -280,2 +317,3 @@ class pytestPDB(object):
"""Invoke debugging via ``Pdb.set_trace``, dropping any IO capturing."""
+ tty()
frame = sys._getframe().f_back
@@ -295,2 +333,3 @@ class PdbInvoke(object):
sys.stdout.write(err)
+ tty()
assert call.excinfo is not None
|
