aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/livestreamer/plugins/ustreamtv.py
diff options
context:
space:
mode:
authorGravatar Christopher Rosell <chrippa@tanuki.se>2011-10-13 20:47:51 +0200
committerGravatar Christopher Rosell <chrippa@tanuki.se>2011-10-13 20:47:51 +0200
commit5ff656ef3e5ccc7357c4d4e6136be2e15e61281b (patch)
tree13da870718eae6a073e3f7499b6f545aae64ccf6 /src/livestreamer/plugins/ustreamtv.py
parent9f43ad3e0c14c8782bc9dd69db2c61cb1dd9dc92 (diff)
Add livestreamer.compat for 2.6 and 2.7 support.
Diffstat (limited to 'src/livestreamer/plugins/ustreamtv.py')
-rw-r--r--src/livestreamer/plugins/ustreamtv.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/livestreamer/plugins/ustreamtv.py b/src/livestreamer/plugins/ustreamtv.py
index a33b1d4..90b4b8b 100644
--- a/src/livestreamer/plugins/ustreamtv.py
+++ b/src/livestreamer/plugins/ustreamtv.py
@@ -2,8 +2,8 @@
from livestreamer.plugins import Plugin, register_plugin
from livestreamer.utils import CommandLine
+from livestreamer.compat import urllib, str, bytes
-import urllib.request, urllib.error, urllib.parse
import xml.dom.minidom, re
@@ -15,7 +15,7 @@ class UStreamTV(Plugin):
return "ustream.tv" in url
def get_channel_id(self, url):
- fd = urllib.request.urlopen(url)
+ fd = urllib.urlopen(url)
data = fd.read()
fd.close()
@@ -35,7 +35,7 @@ class UStreamTV(Plugin):
if not channelid:
return False
- fd = urllib.request.urlopen(self.AMFURL.format(channelid))
+ fd = urllib.urlopen(self.AMFURL.format(channelid))
data = fd.read()
fd.close()