Merge remote-tracking branch 'rbrito/set-age'

Conflicts:
	youtube_dl/extractor/xhamster.py

diff --git a/setup.py b/setup.py
index 3b6dc2d40f0f551630dac1007aaf72e0af819724..2391c527298299a616551d77a3a7a07d764df38d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(
     ' YouTube.com and other video sites.',
     url='https://github.com/rg3/youtube-dl',
     author='Ricardo Garcia',
+    author_email='ytdl@yt-dl.org',
     maintainer='Philipp Hagemeister',
     maintainer_email='phihag@phihag.de',
     packages=['youtube_dl', 'youtube_dl.extractor'],

diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index f060d90666a75cef01c25341c3d6a843d467a39a..81c4be3269150aafc72f6ff0980923119c299373 100644 (file)
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -28,8 +28,8 @@ class XHamsterIE(InfoExtractor):
         u'file': u'2221348.flv',
         u'md5': u'e767b9475de189320f691f49c679c4c7',
         u'info_dict': {
-            u"upload_date": u"20130914", 
-            u"uploader_id": u"jojo747400", 
+            u"upload_date": u"20130914",
+            u"uploader_id": u"jojo747400",
             u"title": u"Britney Spears  Sexy Booty",
             u"age_limit": 18,
         }
@@ -74,6 +74,8 @@ class XHamsterIE(InfoExtractor):
         video_thumbnail = self._search_regex(r'\'image\':\'(?P<thumbnail>[^\']+)\'',
             webpage, u'thumbnail', fatal=False)
 
+        age_limit = self._rta_search(webpage)
+
         return [{
             'id':       video_id,
             'url':      video_url,
@@ -83,5 +85,5 @@ class XHamsterIE(InfoExtractor):
             'upload_date': video_upload_date,
             'uploader_id': video_uploader_id,
             'thumbnail': video_thumbnail,
-            'age_limit': 18,
+            'age_limit': age_limit,
         }]