diff options
author | Christopher Rosell <chrippa@tanuki.se> | 2012-07-23 16:50:24 +0200 |
---|---|---|
committer | Christopher Rosell <chrippa@tanuki.se> | 2012-07-23 16:50:24 +0200 |
commit | 0c00231fae0595e841e3b54c4b793c629b1cace4 (patch) | |
tree | f953539394078390264808e2651deafe8bdca1e7 | |
parent | 1c3db3ea3c8d843f178fa6a5400705e6fe29b925 (diff) |
Add 15 sec timeout for HTTP requests.
-rw-r--r-- | src/livestreamer/utils.py | 4 |
1 files 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: |