Initiate a new release.

[youtubedl] / youtube_dl / extractor / xnxx.py

diff --git a/youtube_dl/extractor/xnxx.py b/youtube_dl/extractor/xnxx.py
index 7a73b243080406b29b6c4a17d50a3e4d1ac023cb..79ed6c744242bf132afd033ae35949cc1e2263b5 100644 (file)
--- a/youtube_dl/extractor/xnxx.py
+++ b/youtube_dl/extractor/xnxx.py
@@ -1,10 +1,8 @@
 # encoding: utf-8
 from __future__ import unicode_literals
 
 # encoding: utf-8
 from __future__ import unicode_literals
 

-import re
-

 from .common import InfoExtractor
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_urllib_parse,
 )
 
     compat_urllib_parse,
 )
 


@@ -23,21 +21,18 @@ class XNXXIE(InfoExtractor):
     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-
-        # Get webpage content
+        video_id = self._match_id(url)

         webpage = self._download_webpage(url, video_id)
 
         video_url = self._search_regex(r'flv_url=(.*?)&',
         webpage = self._download_webpage(url, video_id)
 
         video_url = self._search_regex(r'flv_url=(.*?)&',

-            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',
         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;',
 
         video_thumbnail = self._search_regex(r'url_bigthumb=(.*?)&amp;',

-            webpage, 'thumbnail', fatal=False)
+                                             webpage, 'thumbnail', fatal=False)

 
         return {
             'id': video_id,
 
         return {
             'id': video_id,