diff options
Diffstat (limited to 'hypervideo_dl/downloader/rtmp.py')
| -rw-r--r-- | hypervideo_dl/downloader/rtmp.py | 12 | 
1 files changed, 4 insertions, 8 deletions
| diff --git a/hypervideo_dl/downloader/rtmp.py b/hypervideo_dl/downloader/rtmp.py index 90f1acf..0e09525 100644 --- a/hypervideo_dl/downloader/rtmp.py +++ b/hypervideo_dl/downloader/rtmp.py @@ -1,18 +1,15 @@ -from __future__ import unicode_literals -  import os  import re  import subprocess  import time  from .common import FileDownloader -from ..compat import compat_str  from ..utils import ( +    Popen,      check_executable, -    encodeFilename,      encodeArgument, +    encodeFilename,      get_exe_version, -    Popen,  ) @@ -94,8 +91,7 @@ class RtmpFD(FileDownloader):                      self.to_screen('')                  return proc.wait()              except BaseException:  # Including KeyboardInterrupt -                proc.kill() -                proc.wait() +                proc.kill(timeout=None)                  raise          url = info_dict['url'] @@ -146,7 +142,7 @@ class RtmpFD(FileDownloader):          if isinstance(conn, list):              for entry in conn:                  basic_args += ['--conn', entry] -        elif isinstance(conn, compat_str): +        elif isinstance(conn, str):              basic_args += ['--conn', conn]          if protocol is not None:              basic_args += ['--protocol', protocol] | 
