diff options
| author | Jeff Crouse <jefftimesten@gmail.com> | 2012-12-15 23:22:07 -0500 |
|---|---|---|
| committer | Jeff Crouse <jefftimesten@gmail.com> | 2012-12-15 23:22:07 -0500 |
| commit | 9a2cf56d512d0a459af652b1262255601b4a86e8 (patch) | |
| tree | 9fd01048b60b78546db951484e74fb585f9e56f0 /youtube_dl/InfoExtractors.py | |
| parent | 5f7ad216333afc541fd28280dd3f8a5e4cf82396 (diff) | |
Fixed a problem with the XNXXIE Regex
Diffstat (limited to 'youtube_dl/InfoExtractors.py')
| -rw-r--r-- | youtube_dl/InfoExtractors.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 15dd15307..c44fc852c 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -3186,7 +3186,7 @@ class YoukuIE(InfoExtractor): class XNXXIE(InfoExtractor): """Information extractor for xnxx.com""" - _VALID_URL = r'^http://video\.xnxx\.com/video([0-9]+)/(.*)' + _VALID_URL = r'^(?:https?://)?video\.xnxx\.com/video([0-9]+)/(.*)' IE_NAME = u'xnxx' VIDEO_URL_RE = r'flv_url=(.*?)&' VIDEO_TITLE_RE = r'<title>(.*?)\s+-\s+XNXX.COM' @@ -3509,7 +3509,7 @@ class YouPornIE(InfoExtractor): }) if self._downloader.params.get('listformats', None): - self._print_formats(results) + self._print_formats(formats) return req_format = self._downloader.params.get('format', None) |