diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 21:33:31 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 21:33:31 +0100 |
commit | 784b6d3a9bc79fe55a8b132fd10555c1e9a61c31 (patch) | |
tree | e9a7996c44fd8d07f0bef5cdebbafdbe9c0b7bb4 /youtube_dl/extractor/kankan.py | |
parent | f3a34072266c0a7595f73fa032685cf8a50d2ab4 (diff) | |
parent | 2514d2635e0c8ff0fb72d00a093a849001df2bdd (diff) |
Merge remote-tracking branch 'jtwaleson/master'
Diffstat (limited to 'youtube_dl/extractor/kankan.py')
-rw-r--r-- | youtube_dl/extractor/kankan.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/kankan.py b/youtube_dl/extractor/kankan.py index 23103b163..dbfe4cc03 100644 --- a/youtube_dl/extractor/kankan.py +++ b/youtube_dl/extractor/kankan.py @@ -10,7 +10,7 @@ _md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest() class KankanIE(InfoExtractor): _VALID_URL = r'https?://(?:.*?\.)?kankan\.com/.+?/(?P<id>\d+)\.shtml' - + _TEST = { 'url': 'http://yinyue.kankan.com/vod/48/48863.shtml', 'file': '48863.flv', |