[ExtremeTubeIE] Set age_limit to 18 and fix uploader extraction

diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dl/extractor/extremetube.py
index 981de430d98f02c18f8909b02bb3dfc7f8936719..0f1eec40f86de4a7ac52507f77398b7d20039de2 100644 (file)
--- a/youtube_dl/extractor/extremetube.py
+++ b/youtube_dl/extractor/extremetube.py
@@ -31,15 +31,13 @@ class ExtremeTubeIE(InfoExtractor):
         webpage = self._download_webpage(req, video_id)
 
         video_title = self._html_search_regex(r'<h1 [^>]*?title="([^"]+)"[^>]*>\1<', webpage, u'title')
-        uploader = self._html_search_regex(r'>Posted by:(?=<)(\s|<[^>]*>)*(.+?)\|', webpage, u'uploader', fatal=False)
+        uploader = self._html_search_regex(r'>Posted by:(?=<)(?:\s|<[^>]*>)*(.+?)\|', webpage, u'uploader', fatal=False)
         video_url = compat_urllib_parse.unquote(self._html_search_regex(r'video_url=(.+?)&amp;', webpage, u'video_url'))
         path = compat_urllib_parse_urlparse( video_url ).path
         extension = os.path.splitext( path )[1][1:]
         format = path.split('/')[5].split('_')[:2]
         format = "-".join( format )
 
-        age_limit = self._rta_search(webpage)
-
         return {
             'id': video_id,
             'title': video_title,
@@ -48,5 +46,5 @@ class ExtremeTubeIE(InfoExtractor):
             'ext': extension,
             'format': format,
             'format_id': format,
-            'age_limit': age_limit,
+            'age_limit': 18,
         }