aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/livestreamer/plugins/justintv.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/justintv.py
parent9f43ad3e0c14c8782bc9dd69db2c61cb1dd9dc92 (diff)
Add livestreamer.compat for 2.6 and 2.7 support.
Diffstat (limited to 'src/livestreamer/plugins/justintv.py')
-rw-r--r--src/livestreamer/plugins/justintv.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/livestreamer/plugins/justintv.py b/src/livestreamer/plugins/justintv.py
index 6607ae4..04ed74d 100644
--- a/src/livestreamer/plugins/justintv.py
+++ b/src/livestreamer/plugins/justintv.py
@@ -2,9 +2,9 @@
from livestreamer.plugins import Plugin, register_plugin
from livestreamer.utils import CommandLine
+from livestreamer.compat import urllib, str
-import urllib.request, urllib.error, urllib.parse
-import xml.dom.minidom, re
+import xml.dom.minidom, re, sys
class JustinTV(object):
StreamInfoURL = "http://usher.justin.tv/find/%s.xml?type=any"
@@ -14,7 +14,7 @@ class JustinTV(object):
return ("justin.tv" in url) or ("twitch.tv" in url)
def get_channel_name(self, url):
- fd = urllib.request.urlopen(url)
+ fd = urllib.urlopen(url)
data = fd.read()
fd.close()
@@ -42,7 +42,7 @@ class JustinTV(object):
if not channelname:
return False
- fd = urllib.request.urlopen(self.StreamInfoURL % channelname)
+ fd = urllib.urlopen(self.StreamInfoURL % channelname)
data = fd.read()
fd.close()