From d5942525de7b54f7559402d52e89ec08fd987152 Mon Sep 17 00:00:00 2001 From: Christopher Rosell Date: Fri, 7 Sep 2012 12:39:17 +0200 Subject: Get rid of urllib and use requests instead. --- src/livestreamer/stream.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/livestreamer/stream.py') diff --git a/src/livestreamer/stream.py b/src/livestreamer/stream.py index e71e3bc..f72217b 100644 --- a/src/livestreamer/stream.py +++ b/src/livestreamer/stream.py @@ -1,5 +1,5 @@ -from .utils import urlopen from .compat import str, is_win32 +from .utils import urlopen import os import pbs @@ -89,13 +89,18 @@ class RTMPStream(StreamProcess): return False class HTTPStream(Stream): - def __init__(self, session, url): + def __init__(self, session, url, **args): Stream.__init__(self, session) self.url = url + self.args = args def open(self): - return urlopen(self.url) + try: + res = urlopen(self.url, prefetch=False, **self.args) + except Exception as err: + raise StreamError(str(err)) + return res.raw __all__ = ["StreamError", "Stream", "StreamProcess", "RTMPStream", "HTTPStream"] -- cgit v1.2.3