From: Sergey M․ <dstftw@gmail.com>
Date: Thu, 31 Mar 2016 16:55:49 +0000 (+0600)
Subject: [utils] Use update_Request in http_request
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=15d260ebaa48409112270685d306a5d9152260c4;p=youtube-dl

[utils] Use update_Request in http_request
---

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 4532b737b..5c4ab2748 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -778,12 +778,7 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
 
         # Substitute URL if any change after escaping
         if url != url_escaped:
-            req_type = HEADRequest if req.get_method() == 'HEAD' else compat_urllib_request.Request
-            new_req = req_type(
-                url_escaped, data=req.data, headers=req.headers,
-                origin_req_host=req.origin_req_host, unverifiable=req.unverifiable)
-            new_req.timeout = req.timeout
-            req = new_req
+            req = update_Request(req, url=url_escaped)
 
         for h, v in std_headers.items():
             # Capitalize is needed because of Python bug 2275: http://bugs.python.org/issue2275