From: Jaime Marquínez Ferrándiz Date: Mon, 10 Mar 2014 18:01:29 +0000 (+0100) Subject: Don't set the global socket timeout X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=19a41fc613b78073de44407703f53347d44667d6;p=youtube-dl Don't set the global socket timeout Use the timeout argument of the `OpenerDirector.open` method instead --- diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 523eba3c1..c1bd0b085 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1167,7 +1167,7 @@ class YoutubeDL(object): def urlopen(self, req): """ Start an HTTP download """ - return self._opener.open(req) + return self._opener.open(req, timeout=self._socket_timeout) def print_debug_header(self): if not self.params.get('verbose'): @@ -1198,7 +1198,7 @@ class YoutubeDL(object): def _setup_opener(self): timeout_val = self.params.get('socket_timeout') - timeout = 600 if timeout_val is None else float(timeout_val) + self._socket_timeout = 600 if timeout_val is None else float(timeout_val) opts_cookiefile = self.params.get('cookiefile') opts_proxy = self.params.get('proxy') @@ -1239,4 +1239,3 @@ class YoutubeDL(object): # TODO remove this global modification compat_urllib_request.install_opener(opener) - socket.setdefaulttimeout(timeout)