From 7ce4938cff4b4f352cc2cade258391be2771fede Mon Sep 17 00:00:00 2001
From: Christopher Rosell <chrippa@tanuki.se>
Date: Sat, 8 Sep 2012 00:13:07 +0200
Subject: Add a exception argument to urlopen.

---
 src/livestreamer/stream.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/livestreamer/stream.py')

diff --git a/src/livestreamer/stream.py b/src/livestreamer/stream.py
index f72217b..82d9a9a 100644
--- a/src/livestreamer/stream.py
+++ b/src/livestreamer/stream.py
@@ -1,5 +1,5 @@
 from .compat import str, is_win32
-from .utils import urlopen
+from .utils import urlget
 
 import os
 import pbs
@@ -96,10 +96,9 @@ class HTTPStream(Stream):
         self.args = args
 
     def open(self):
-        try:
-            res = urlopen(self.url, prefetch=False, **self.args)
-        except Exception as err:
-            raise StreamError(str(err))
+        res = urlget(self.url, prefetch=False,
+                     exception=StreamError,
+                     **self.args)
 
         return res.raw
 
-- 
cgit v1.2.3