Merge branch 'master' of github.com:rg3/youtube-dl

This commit is contained in:
Philipp Hagemeister 2014-05-19 17:10:19 +02:00
commit f50ee8d1c3

View file

@ -4,9 +4,7 @@ import re
from .brightcove import BrightcoveIE from .brightcove import BrightcoveIE
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import ExtractorError
ExtractorError,
)
class NownessIE(InfoExtractor): class NownessIE(InfoExtractor):
@ -14,9 +12,10 @@ class NownessIE(InfoExtractor):
_TEST = { _TEST = {
'url': 'http://www.nowness.com/day/2013/6/27/3131/candor--the-art-of-gesticulation', 'url': 'http://www.nowness.com/day/2013/6/27/3131/candor--the-art-of-gesticulation',
'file': '2520295746001.mp4', 'md5': '068bc0202558c2e391924cb8cc470676',
'md5': '0ece2f70a7bd252c7b00f3070182d418',
'info_dict': { 'info_dict': {
'id': '2520295746001',
'ext': 'mp4',
'description': 'Candor: The Art of Gesticulation', 'description': 'Candor: The Art of Gesticulation',
'uploader': 'Nowness', 'uploader': 'Nowness',
'title': 'Candor: The Art of Gesticulation', 'title': 'Candor: The Art of Gesticulation',