diff options
| -rw-r--r-- | youtube_dl/downloader/http.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/appletrailers.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/common.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/videomega.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/wdr.py | 4 | 
5 files changed, 9 insertions, 8 deletions
| diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py index 90a2e4c53..4db50ee90 100644 --- a/youtube_dl/downloader/http.py +++ b/youtube_dl/downloader/http.py @@ -24,10 +24,6 @@ class HttpFD(FileDownloader):          # Do not include the Accept-Encoding header          headers = {'Youtubedl-no-compression': 'True'} -        if 'user_agent' in info_dict: -            headers['User-agent'] = info_dict['user_agent'] -        if 'http_referer' in info_dict: -            headers['Referer'] = info_dict['http_referer']          add_headers = info_dict.get('http_headers')          if add_headers:              headers.update(add_headers) diff --git a/youtube_dl/extractor/appletrailers.py b/youtube_dl/extractor/appletrailers.py index 7cd0482c7..70621946d 100644 --- a/youtube_dl/extractor/appletrailers.py +++ b/youtube_dl/extractor/appletrailers.py @@ -129,7 +129,9 @@ class AppleTrailersIE(InfoExtractor):                  'thumbnail': thumbnail,                  'upload_date': upload_date,                  'uploader_id': uploader_id, -                'user_agent': 'QuickTime compatible (youtube-dl)', +                'http_headers': { +                    'User-Agent': 'QuickTime compatible (youtube-dl)', +                },              })          return { diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 03f3f18c8..523400062 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -108,7 +108,6 @@ class InfoExtractor(object):                                    (quality takes higher priority)                                   -1 for default (order by other properties),                                   -2 or smaller for less than default. -                    * http_referer  HTTP Referer header value to set.                      * http_method  HTTP method to use for the download.                      * http_headers  A dictionary of additional HTTP headers                                   to add to the request. diff --git a/youtube_dl/extractor/videomega.py b/youtube_dl/extractor/videomega.py index fc6e05fe0..273030316 100644 --- a/youtube_dl/extractor/videomega.py +++ b/youtube_dl/extractor/videomega.py @@ -62,5 +62,7 @@ class VideoMegaIE(InfoExtractor):              'title': title,              'formats': formats,              'thumbnail': thumbnail, -            'http_referer': iframe_url, +            'http_headers': { +                'Referer': iframe_url, +            },          } diff --git a/youtube_dl/extractor/wdr.py b/youtube_dl/extractor/wdr.py index 45466e31b..313b9c15d 100644 --- a/youtube_dl/extractor/wdr.py +++ b/youtube_dl/extractor/wdr.py @@ -169,7 +169,9 @@ class WDRMobileIE(InfoExtractor):              'title': mobj.group('title'),              'age_limit': int(mobj.group('age_limit')),              'url': url, -            'user_agent': 'mobile', +            'http_headers': { +                'User-Agent': 'mobile', +            },          } | 
