pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-02-01 00:00:11 +09:00
Code Issues Projects Releases Wiki Activity

flake8 style fixes

Browse Source
This commit is contained in:
Sacha Arnoud 2021-09-21 16:40:08 +00:00
parent f02f87db8e
commit 3b9dad9942
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/YoutubeDL.py
View File

@ -91,6 +91,7 @@ from .utils import (
write_string, write_string,
YoutubeDLCookieJar, YoutubeDLCookieJar,
YoutubeDLCookieProcessor, YoutubeDLCookieProcessor,
YoutubeDLError,
YoutubeDLHandler, YoutubeDLHandler,
YoutubeDLRedirectHandler, YoutubeDLRedirectHandler,
) )
@ -1862,7 +1863,6 @@ class YoutubeDL(object):
# subtitles download errors are already managed as troubles in relevant IE # subtitles download errors are already managed as troubles in relevant IE
# that way it will silently go on when used with unsupporting IE # that way it will silently go on when used with unsupporting IE
subtitles = info_dict['requested_subtitles'] subtitles = info_dict['requested_subtitles']
ie = self.get_info_extractor(info_dict['extractor_key'])
for sub_lang, sub_info in subtitles.items(): for sub_lang, sub_info in subtitles.items():
sub_format = sub_info['ext'] sub_format = sub_info['ext']
sub_filename = subtitles_filename(filename, sub_lang, sub_format, info_dict.get('ext')) sub_filename = subtitles_filename(filename, sub_lang, sub_format, info_dict.get('ext'))
@ -1887,7 +1887,7 @@ class YoutubeDL(object):
# The FD is supposed to encodeFilename() # The FD is supposed to encodeFilename()
if not fd.download(sub_filename, sub_info): if not fd.download(sub_filename, sub_info):
# depending on the FD, it may catch errors and return False, or not # depending on the FD, it may catch errors and return False, or not
raise DownloadError('Subtitle download failed') raise YoutubeDLError('Subtitle download failed')
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error, OSError, IOError, YoutubeDLError) as err: except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error, OSError, IOError, YoutubeDLError) as err:
self.report_warning('Unable to download subtitle for "%s": %s' % self.report_warning('Unable to download subtitle for "%s": %s' %
(sub_lang, error_to_compat_str(err))) (sub_lang, error_to_compat_str(err)))

3
youtube_dl/downloader/__init__.py
View File

@ -33,8 +33,7 @@ def get_suitable_downloader(info_dict, params={}):
"""Get the downloader class that can handle the info dict.""" """Get the downloader class that can handle the info dict."""
protocol = determine_protocol(info_dict) protocol = determine_protocol(info_dict)
info_dict['protocol'] = protocol info_dict['protocol'] = protocol
print('SACHA> ', protocol)
# if (info_dict.get('start_time') or info_dict.get('end_time')) and not info_dict.get('requested_formats') and FFmpegFD.can_download(info_dict): # if (info_dict.get('start_time') or info_dict.get('end_time')) and not info_dict.get('requested_formats') and FFmpegFD.can_download(info_dict):
# return FFmpegFD # return FFmpegFD

1
youtube_dl/extractor/francetv.py
View File

@ -17,7 +17,6 @@ from ..utils import (
url_or_none, url_or_none,
) )
from .dailymotion import DailymotionIE from .dailymotion import DailymotionIE
from ..downloader import PROTOCOL_MAP
class FranceTVBaseInfoExtractor(InfoExtractor): class FranceTVBaseInfoExtractor(InfoExtractor):