nhyatt/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-06-30 11:02:51 -05:00
Code Issues Projects Releases Wiki Activity

Don't use bare 'except:'

Browse Source 
They catch any exception, including KeyboardInterrupt, we don't want to catch it.
This commit is contained in:
Jaime Marquínez Ferrándiz
2015-03-27 13:02:20 +01:00
parent af14000215
commit 70a1165b32
8 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/postprocessor/ffmpeg.py
View File

@ -3,7 +3,6 @@ from __future__ import unicode_literals
import io
import os
import subprocess
import sys
import time
@ -269,19 +268,17 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
else:
self._downloader.to_screen('[' + self.basename + '] Destination: ' + new_path)
self.run_ffmpeg(path, new_path, acodec, more_opts)
except:
etype, e, tb = sys.exc_info()
if isinstance(e, AudioConversionError):
msg = 'audio conversion failed: ' + e.msg
else:
msg = 'error running ' + self.basename
raise PostProcessingError(msg)
except AudioConversionError as e:
raise PostProcessingError(
'audio conversion failed: ' + e.msg)
except Exception:
raise PostProcessingError('error running ' + self.basename)
# Try to update the date time for extracted audio file.
if information.get('filetime') is not None:
try:
os.utime(encodeFilename(new_path), (time.time(), information['filetime']))
except:
except Exception:
self._downloader.report_warning('Cannot update utime of audio file')
information['filepath'] = new_path