X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fxnxx.py;h=e0a6255dc4df8f2a2bd56ffcf1363089a08e6aea;hb=dcdb292fddc82ae11f4c0b647815a45c88a6b6d5;hp=f0d4cb9bc3610e233690fa071303dcadce8166a9;hpb=73843ae8acb378e986ab4e7bb3a525b2f6b53cf2;p=youtube-dl

diff --git a/youtube_dl/extractor/xnxx.py b/youtube_dl/extractor/xnxx.py
index f0d4cb9bc..e0a6255dc 100644
--- a/youtube_dl/extractor/xnxx.py
+++ b/youtube_dl/extractor/xnxx.py
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# coding: utf-8
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
@@ -6,19 +6,22 @@ from ..compat import compat_urllib_parse_unquote
 
 
 class XNXXIE(InfoExtractor):
-    _VALID_URL = r'^https?://(?:video|www)\.xnxx\.com/video-?(?P<id>[0-9a-z]+)/(.*)'
+    _VALID_URL = r'https?://(?:video|www)\.xnxx\.com/video-?(?P<id>[0-9a-z]+)/'
     _TESTS = [{
-        'url': 'http://www.xnxx.com/video-6gqggeb/hd_star-581_sam',
-        'md5': '6a2a6aff3f10467d94e572edb7b7deb6',
+        'url': 'http://www.xnxx.com/video-55awb78/skyrim_test_video',
+        'md5': 'ef7ecee5af78f8b03dca2cf31341d3a0',
         'info_dict': {
-            'id': '6gqggeb',
+            'id': '55awb78',
             'ext': 'flv',
-            'title': 'HD STAR-581 sam',
+            'title': 'Skyrim Test Video',
             'age_limit': 18,
         },
     }, {
         'url': 'http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_',
         'only_matching': True,
+    }, {
+        'url': 'http://www.xnxx.com/video-55awb78/',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):