aboutsummaryrefslogtreecommitdiff
path: root/test/helper.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-07 19:06:36 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-07 19:06:36 +0200
commitb2ad967e4561f0bcb73fca3281341751471cab91 (patch)
treef2a252a223efd21bf21227df4f702dc2a5931836 /test/helper.py
parenta27b9e8bd592c880e65ab6bb3e15e1f5f8727cd8 (diff)
Simplify test setup
Diffstat (limited to 'test/helper.py')
-rw-r--r--test/helper.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/helper.py b/test/helper.py
index 884cf32dc..ad1b74dd3 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -12,12 +12,7 @@ from youtube_dl.utils import (
compat_urllib_request,
)
-# General configuration (from __init__, not very elegant...)
-jar = compat_cookiejar.CookieJar()
-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)
+youtube_dl._setup_opener(timeout=10)
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
with io.open(PARAMETERS_FILE, encoding='utf-8') as pf: