Proper support for changing User-Agents from IEs

[youtube-dl] / youtube_dl / FileDownloader.py

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index f0879a675b5f83ea95f1066c1f8ffcb8fff163eb..04ecd1ac5447cd306cc7d45bd67449e6f9bb66a4 100644 (file)
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -545,7 +545,7 @@ class FileDownloader(object):
                         keep_video = keep_video_wish
             except PostProcessingError as e:
                 self.to_stderr(u'ERROR: ' + e.msg)
-        if not keep_video and not self.params.get('keepvideo', False):
+        if keep_video is False and not self.params.get('keepvideo', False):
             try:
                 self.to_stderr(u'Deleting original file %s (pass -k to keep)' % filename)
                 os.remove(encodeFilename(filename))
@@ -620,6 +620,8 @@ class FileDownloader(object):
 
         # Do not include the Accept-Encoding header
         headers = {'Youtubedl-no-compression': 'True'}
+        if 'user_agent' in info_dict:
+            headers['Youtubedl-user-agent'] = info_dict['user_agent']
         basic_request = compat_urllib_request.Request(url, None, headers)
         request = compat_urllib_request.Request(url, None, headers)