diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2013-10-19 21:16:14 +0200 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2013-10-19 21:16:14 +0200 |
commit | f8b45beacccbc5c237b0a04a568b51d602b1c1d3 (patch) | |
tree | dcc6640eb64d9cba033a270135e2f26097d32480 /youtube_dl/extractor/youporn.py | |
parent | 9d92015d436af21b1a6ef00837a1984d76b259e1 (diff) | |
parent | 50a6150ed9a0d5af39c27b5dba1e06deadd767cf (diff) | |
download | youtube-dl-f8b45beacccbc5c237b0a04a568b51d602b1c1d3.tar.xz |
Merge remote-tracking branch 'rbrito/set-age'
Conflicts:
youtube_dl/extractor/xhamster.py
Diffstat (limited to 'youtube_dl/extractor/youporn.py')
-rw-r--r-- | youtube_dl/extractor/youporn.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py index b1f93dd1b..e3b56cece 100644 --- a/youtube_dl/extractor/youporn.py +++ b/youtube_dl/extractor/youporn.py @@ -26,7 +26,8 @@ class YouPornIE(InfoExtractor): u"upload_date": u"20101221", u"description": u"Love & Sex Answers: http://bit.ly/DanAndJenn -- Is It Unhealthy To Masturbate Daily?", u"uploader": u"Ask Dan And Jennifer", - u"title": u"Sex Ed: Is It Safe To Masturbate Daily?" + u"title": u"Sex Ed: Is It Safe To Masturbate Daily?", + u"age_limit": 18, } } |