X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fdownloader%2Ff4m.py;h=0e7a1c20075499e58b977da4154ce287b144f958;hb=057c0609fc6620017ff4a5b30847e0dc2644df9f;hp=29de7630d3de72bb9ba2cb8efccbe17644d3808f;hpb=c7ff0c6422f2cae88e80bc286b3df391042fcb09;p=youtube-dl diff --git a/youtube_dl/downloader/f4m.py b/youtube_dl/downloader/f4m.py index 29de7630d..0e7a1c200 100644 --- a/youtube_dl/downloader/f4m.py +++ b/youtube_dl/downloader/f4m.py @@ -231,20 +231,20 @@ class F4mFD(FileDownloader): """ def _get_unencrypted_media(self, doc): - media=doc.findall(_add_ns('media')) + media = doc.findall(_add_ns('media')) if not media: self.report_error('No media found') for e in (doc.findall(_add_ns('drmAdditionalHeader')) + doc.findall(_add_ns('drmAdditionalHeaderSet'))): # If id attribute is missing it's valid for all media nodes # without drmAdditionalHeaderId or drmAdditionalHeaderSetId attribute - if not 'id' in e.attrib: - self.report_error('Media is DRM protected') + if 'id' not in e.attrib: + self.report_error('Missing ID in f4m DRM') media = list(filter(lambda e: 'drmAdditionalHeaderId' not in e.attrib and 'drmAdditionalHeaderSetId' not in e.attrib, media)) if not media: - self.report_error('Media is DRM protected') + self.report_error('Unsupported DRM') return media def real_download(self, filename, info_dict):