From 0f0ba9870ec9eacb413404b0cff071174aeddea5 Mon Sep 17 00:00:00 2001 From: Chris Down Date: Sat, 3 Jun 2017 01:58:41 +0100 Subject: [PATCH] Do not attempt to use sys.std{out,in}.buffer on Python 2 --- srt_tools/utils.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srt_tools/utils.py b/srt_tools/utils.py index cb7f936..4b99c7b 100755 --- a/srt_tools/utils.py +++ b/srt_tools/utils.py @@ -13,9 +13,12 @@ else: _open = open +STDIN_BYTESTREAM = getattr(sys.stdin, 'buffer', sys.stdin) +STDOUT_BYTESTREAM = getattr(sys.stdout, 'buffer', sys.stdout) + DASH_STREAM_MAP = { - 'input': sys.stdin.buffer, - 'output': sys.stdout.buffer, + 'input': STDIN_BYTESTREAM, + 'output': STDOUT_BYTESTREAM, } log = logging.getLogger(__name__) @@ -52,7 +55,7 @@ def basic_parser(multi_input=False, no_output=False): else: parser.add_argument( '--input', '-i', metavar='FILE', - default=sys.stdin.buffer, + default=STDIN_BYTESTREAM, type=lambda arg: dash_to_stream(arg, 'input'), help='the file to process (default: stdin)', ) @@ -60,7 +63,7 @@ def basic_parser(multi_input=False, no_output=False): if not no_output: parser.add_argument( '--output', '-o', metavar='FILE', - default=sys.stdout.buffer, + default=STDOUT_BYTESTREAM, type=lambda arg: dash_to_stream(arg, 'output'), help='the file to write to (default: stdout)', )