]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Fix --extract-audio on Python 3
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 16 Dec 2012 11:29:03 +0000 (12:29 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 16 Dec 2012 11:29:03 +0000 (12:29 +0100)
youtube_dl/PostProcessor.py
youtube_dl/utils.py

index af00f80eed35ecb6b6826d01fc22bb58e4ce188f..cc7789e3bfee5cc3d7c1cb694285dfab70a2fbf8 100644 (file)
@@ -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:
index 44f939053adf5fcf6a2ab1ad4cb9c0eac5cedd7a..25b67db0665af756ee32dac797f18a647004ff1f 100644 (file)
@@ -51,6 +51,12 @@ try:
 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