diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-12-15 18:19:25 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-12-15 18:19:25 +0100 |
| commit | bec102a843bbc8e53f5cf3a71f1259536e62b70b (patch) | |
| tree | 4239db65d813640b63803807f3b4f105e436563d | |
| parent | 8f6f40d99180ab00c918a79641a1e5508e90c76a (diff) | |
| download | youtube-dl-bec102a843bbc8e53f5cf3a71f1259536e62b70b.tar.xz | |
Fix XNXX in Python 3
| -rw-r--r-- | youtube_dl/InfoExtractors.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index b1ede697a..637b14bc0 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -3424,13 +3424,14 @@ class XNXXIE(InfoExtractor): if mobj is None: self._downloader.trouble(u'ERROR: invalid URL: %s' % url) return - video_id = mobj.group(1).decode('utf-8') + video_id = mobj.group(1) self.report_webpage(video_id) # Get webpage content try: - webpage = compat_urllib_request.urlopen(url).read() + webpage_bytes = compat_urllib_request.urlopen(url).read() + webpage = webpage_bytes.decode('utf-8') except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % err) return @@ -3439,19 +3440,19 @@ class XNXXIE(InfoExtractor): if result is None: self._downloader.trouble(u'ERROR: unable to extract video url') return - video_url = compat_urllib_parse.unquote(result.group(1).decode('utf-8')) + video_url = compat_urllib_parse.unquote(result.group(1)) result = re.search(self.VIDEO_TITLE_RE, webpage) if result is None: self._downloader.trouble(u'ERROR: unable to extract video title') return - video_title = result.group(1).decode('utf-8') + video_title = result.group(1) result = re.search(self.VIDEO_THUMB_RE, webpage) if result is None: self._downloader.trouble(u'ERROR: unable to extract video thumbnail') return - video_thumbnail = result.group(1).decode('utf-8') + video_thumbnail = result.group(1) return [{ 'id': video_id, |