From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 30 Jan 2015 15:06:55 +0000 (+0100)
Subject: [downloader/f4m] Clarify that we should eventually just implement the DRM scheme... 
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=d543bdc351c073621e2f8647fad0f9c8da1cf5b6;p=youtube-dl

[downloader/f4m] Clarify that we should eventually just implement the DRM scheme (#3000)
---

diff --git a/youtube_dl/downloader/f4m.py b/youtube_dl/downloader/f4m.py
index 29de7630d..13055a67e 100644
--- a/youtube_dl/downloader/f4m.py
+++ b/youtube_dl/downloader/f4m.py
@@ -238,13 +238,13 @@ class F4mFD(FileDownloader):
                   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):