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/plugins/youtube.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/livestreamer/plugins/youtube.py') 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)) -- cgit v1.2.3