aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/livestreamer/plugins/youtube.py
diff options
context:
space:
mode:
authorGravatar Christopher Rosell <chrippa@tanuki.se>2012-09-07 12:39:17 +0200
committerGravatar Christopher Rosell <chrippa@tanuki.se>2012-09-07 12:39:17 +0200
commitd5942525de7b54f7559402d52e89ec08fd987152 (patch)
tree13118ea3329e832d8cf59e7109a4036661c42ac7 /src/livestreamer/plugins/youtube.py
parentc6ae74f76f92cd0f7875ab590c6de7669fd635a4 (diff)
Get rid of urllib and use requests instead.
Diffstat (limited to 'src/livestreamer/plugins/youtube.py')
-rw-r--r--src/livestreamer/plugins/youtube.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/livestreamer/plugins/youtube.py b/src/livestreamer/plugins/youtube.py
index 606a57e..c5f5d37 100644
--- a/src/livestreamer/plugins/youtube.py
+++ b/src/livestreamer/plugins/youtube.py
@@ -12,20 +12,21 @@ class Youtube(Plugin):
return "youtube.com" in url
def _get_stream_info(self, url):
- data = urlget(url)
+ res = urlget(url)
+ data = res.text
config = None
- match = re.search(b"'PLAYER_CONFIG': (.+)\n.+}\);", data)
+ match = re.search("'PLAYER_CONFIG': (.+)\n.+}\);", data)
if match:
config = match.group(1)
- match = re.search(b"yt.playerConfig = (.+)\;\n", data)
+ match = re.search("yt.playerConfig = (.+)\;\n", data)
if match:
config = match.group(1)
if config:
try:
- parsed = json.loads(str(config, "utf8"))
+ parsed = json.loads(config)
except ValueError as err:
raise PluginError(("Unable to parse config JSON: {0})").format(err))