diff options
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/PostProcessor.py | 4 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index af00f80ee..cc7789e3b 100644 --- a/youtube_dl/PostProcessor.py +++ b/youtube_dl/PostProcessor.py @@ -86,14 +86,14 @@ class FFmpegExtractAudioPP(PostProcessor): if not self._exes['ffprobe'] and not self._exes['avprobe']: return None try: cmd = [self._exes['avprobe'] or self._exes['ffprobe'], '-show_streams', '--', encodeFilename(path)] - handle = subprocess.Popen(cmd, stderr=file(os.path.devnull, 'w'), stdout=subprocess.PIPE) + handle = subprocess.Popen(cmd, stderr=compat_subprocess_get_DEVNULL(), stdout=subprocess.PIPE) output = handle.communicate()[0] if handle.wait() != 0: return None except (IOError, OSError): return None audio_codec = None - for line in output.split('\n'): + for line in output.decode('ascii', 'ignore').split('\n'): if line.startswith('codec_name='): audio_codec = line.split('=')[1].strip() elif line.strip() == 'codec_type=audio' and audio_codec is not None: diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 44f939053..25b67db06 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -52,6 +52,12 @@ except ImportError: # Python 2 import httplib as compat_http_client try: + from subprocess import DEVNULL + compat_subprocess_get_DEVNULL = lambda: DEVNULL +except ImportError: + compat_subprocess_get_DEVNULL = lambda: open(os.path.devnull, 'w') + +try: from urllib.parse import parse_qs as compat_parse_qs except ImportError: # Python 2 # HACK: The following is the correct parse_qs implementation from cpython 3's stdlib. |