diff options
| -rw-r--r-- | tftpy/TftpContexts.py | 3 | ||||
| -rw-r--r-- | tftpy/compat.py | 18 |
2 files changed, 1 insertions, 20 deletions
diff --git a/tftpy/TftpContexts.py b/tftpy/TftpContexts.py index f882c2d..0a82c8d 100644 --- a/tftpy/TftpContexts.py +++ b/tftpy/TftpContexts.py @@ -16,7 +16,6 @@ import socket import sys import time -from . import compat from .TftpPacketFactory import TftpPacketFactory from .TftpPacketTypes import * from .TftpShared import * @@ -297,7 +296,7 @@ class TftpContextClientUpload(TftpContext): if hasattr(input, "read"): self.fileobj = input elif input == "-": - self.fileobj = compat.binary_stdin() + self.fileobj = sys.stdin.buffer else: self.fileobj = open(input, "rb") diff --git a/tftpy/compat.py b/tftpy/compat.py deleted file mode 100644 index 788c8ae..0000000 --- a/tftpy/compat.py +++ /dev/null @@ -1,18 +0,0 @@ -import sys - - -def binary_stdin(): - """ - Get a file object for reading binary bytes from stdin instead of text. - Compatible with Py2/3, POSIX & win32. - Credits: https://stackoverflow.com/a/38939320/531179 (CC BY-SA 3.0) - """ - if hasattr(sys.stdin, "buffer"): # Py3+ - return sys.stdin.buffer - else: - if sys.platform == "win32": - import msvcrt - import os - - msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) - return sys.stdin |