aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/xnxx.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-11-23 22:10:26 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-11-23 22:10:26 +0100
commit27f8b0994e9924724c974f46435552d401f5fc08 (patch)
treefa3ab829cc1e81a43f955ca9442ce59dfee6440b /youtube_dl/extractor/xnxx.py
parente311b6389a7582eef6f3f8ca4b41edd4efd6cd55 (diff)
parentfab6d4c048f56aa1c36897396a7fb590ae415d66 (diff)
downloadyoutube-dl-27f8b0994e9924724c974f46435552d401f5fc08.tar.xz
Merge remote-tracking branch 'jtwaleson/master'
Diffstat (limited to 'youtube_dl/extractor/xnxx.py')
-rw-r--r--youtube_dl/extractor/xnxx.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/xnxx.py b/youtube_dl/extractor/xnxx.py
index 7a73b2430..53ed7ef5a 100644
--- a/youtube_dl/extractor/xnxx.py
+++ b/youtube_dl/extractor/xnxx.py
@@ -30,14 +30,14 @@ class XNXXIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
video_url = self._search_regex(r'flv_url=(.*?)&amp;',
- webpage, 'video URL')
+ webpage, 'video URL')
video_url = compat_urllib_parse.unquote(video_url)
video_title = self._html_search_regex(r'<title>(.*?)\s+-\s+XNXX.COM',
- webpage, 'title')
+ webpage, 'title')
video_thumbnail = self._search_regex(r'url_bigthumb=(.*?)&amp;',
- webpage, 'thumbnail', fatal=False)
+ webpage, 'thumbnail', fatal=False)
return {
'id': video_id,