From 0c00231fae0595e841e3b54c4b793c629b1cace4 Mon Sep 17 00:00:00 2001 From: Christopher Rosell Date: Mon, 23 Jul 2012 16:50:24 +0200 Subject: Add 15 sec timeout for HTTP requests. --- src/livestreamer/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/livestreamer/utils.py b/src/livestreamer/utils.py index 177df39..dcf1be3 100644 --- a/src/livestreamer/utils.py +++ b/src/livestreamer/utils.py @@ -22,7 +22,7 @@ class ArgumentParser(argparse.ArgumentParser): def urlopen(url, data=None, timeout=None, opener=None): try: if opener is not None: - fd = opener.open(url) + fd = opener.open(url, data, timeout) else: fd = urllib.urlopen(url, data, timeout) @@ -34,7 +34,7 @@ def urlopen(url, data=None, timeout=None, opener=None): return fd -def urlget(url, data=None, timeout=None, opener=None): +def urlget(url, data=None, timeout=15, opener=None): fd = urlopen(url, data, timeout, opener) try: -- cgit v1.2.3