diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-12-20 21:28:32 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-12-20 21:28:32 +0100 |
| commit | a7c0f8602e91cc96962c7eade10860b61afc3728 (patch) | |
| tree | 01182f741a7b474d91e565e4beb91cc577e726d8 /test/test_write_info_json.py | |
| parent | 21a9c6aaac074b3ad85adc55818573e7971f8043 (diff) | |
| parent | 162e3c52616a72f4ddc11b0e5de0f2425e512896 (diff) | |
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'test/test_write_info_json.py')
| -rw-r--r-- | test/test_write_info_json.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/test_write_info_json.py b/test/test_write_info_json.py index ebf543980..8134dda37 100644 --- a/test/test_write_info_json.py +++ b/test/test_write_info_json.py @@ -3,7 +3,6 @@ import json import os -import socket import sys import unittest @@ -22,7 +21,6 @@ cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) proxy_handler = compat_urllib_request.ProxyHandler() opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) compat_urllib_request.install_opener(opener) -socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) class FileDownloader(youtube_dl.FileDownloader): def __init__(self, *args, **kwargs): |