From 9ea31293e65a9f713bd99c49346c9723787cff74 Mon Sep 17 00:00:00 2001 From: Zach Riggle Date: Sat, 9 May 2015 18:05:24 -0400 Subject: [PATCH] Python2 no likey --- pwndbg/stdio.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pwndbg/stdio.py b/pwndbg/stdio.py index 456f3a78f..7fbbf8fa5 100644 --- a/pwndbg/stdio.py +++ b/pwndbg/stdio.py @@ -13,24 +13,18 @@ import gdb import pwndbg.compat def get(fd, mode): - if pwndbg.compat.python3: - file = io.open(fd, mode=mode, buffering=0, closefd=False) - return io.TextIOWrapper(file, write_through=True) - else: - return os.fdopen(fd, mode, 0) - -stdin = get(0, 'rb') -stdout = get(1, 'wb') -stderr = get(2, 'wb') + file = io.open(fd, mode=mode, buffering=0, closefd=False) + return io.TextIOWrapper(file, write_through=True) class Stdio(object): queue = [] def __enter__(self, *a, **kw): self.queue.append((sys.stdin, sys.stdout, sys.stderr)) - sys.stdin = get(0, 'rb') - sys.stdout = get(1, 'wb') - sys.stderr = get(2, 'wb') + if pwndbg.compat.python3: + sys.stdin = get(0, 'rb') + sys.stdout = get(1, 'wb') + sys.stderr = get(2, 'wb') def __exit__(self, *a, **kw): sys.stdin, sys.stdout, sys.stderr = self.queue.pop()