From: Sergey M Date: Fri, 8 Jan 2016 18:04:32 +0000 (+0500) Subject: Merge pull request #8182 from atomic83/patch-1 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=7e182627d9963b8c95faab2f2c6213d17a8db745;hp=5dbe81a1d35ae704b5ea208698a6bb785923d71a;p=youtube-dl Merge pull request #8182 from atomic83/patch-1 Extract xHamster title fix --- diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index 8938c0e45..261d323a7 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -65,7 +65,7 @@ class XHamsterIE(InfoExtractor): title = self._html_search_regex( [r'(?P<title>.+?)(?:, (?:[^,]+? )?Porn: xHamster| - xHamster\.com)', - r'

([^<]+)

'], webpage, 'title') + r'([^<]+)'], webpage, 'title') # Only a few videos have an description mobj = re.search(r'Description: ([^<]+)', webpage)