X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftube8.py;h=3ec9442c9392fe6168d315925ee83f0df6222b5d;hb=c7f0177fa73e5efe2b3b961d63e5784f5882db21;hp=ebc8c1f4f11544fc2110aadfb1fbf5876502f3bc;hpb=71865091abbb0166edeffff14da019542260557f;p=youtube-dl

diff --git a/youtube_dl/extractor/tube8.py b/youtube_dl/extractor/tube8.py
index ebc8c1f4f..3ec9442c9 100644
--- a/youtube_dl/extractor/tube8.py
+++ b/youtube_dl/extractor/tube8.py
@@ -5,15 +5,13 @@ from .common import InfoExtractor
 from ..utils import (
     compat_urllib_parse_urlparse,
     compat_urllib_request,
-    compat_urllib_parse,
-    unescapeHTML,
 )
 from ..aes import (
     aes_decrypt_text
 )
 
 class Tube8IE(InfoExtractor):
-    _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>tube8\.com/[^/]+/[^/]+/(?P<videoid>[0-9]+)/?)'
+    _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>tube8\.com/.+?/(?P<videoid>\d+)/?)$'
     _TEST = {
         u'url': u'http://www.tube8.com/teen/kasia-music-video/229795/',
         u'file': u'229795.mp4',
@@ -22,6 +20,7 @@ class Tube8IE(InfoExtractor):
             u"description": u"hot teen Kasia grinding", 
             u"uploader": u"unknown", 
             u"title": u"Kasia music video",
+            u"age_limit": 18,
         }
     }
 
@@ -45,10 +44,10 @@ class Tube8IE(InfoExtractor):
         if webpage.find('"encrypted":true')!=-1:
             password = self._html_search_regex(r'"video_title":"([^"]+)', webpage, u'password')
             video_url = aes_decrypt_text(video_url, password, 32).decode('utf-8')
-        path = compat_urllib_parse_urlparse( video_url ).path
-        extension = os.path.splitext( path )[1][1:]
+        path = compat_urllib_parse_urlparse(video_url).path
+        extension = os.path.splitext(path)[1][1:]
         format = path.split('/')[4].split('_')[:2]
-        format = "-".join( format )
+        format = "-".join(format)
 
         return {
             'id': video_id,
@@ -60,4 +59,5 @@ class Tube8IE(InfoExtractor):
             'ext': extension,
             'format': format,
             'format_id': format,
+            'age_limit': 18,
         }