From: Sergey M․ <dstftw@gmail.com>
Date: Wed, 22 Jul 2015 18:12:46 +0000 (+0600)
Subject: Merge branch 'patch/enhance-tagesschau-regex' of https://github.com/rohieb/youtube... 
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=c356620ec14033969d53ca8a2dd432b79046ee20;p=youtube-dl

Merge branch 'patch/enhance-tagesschau-regex' of https://github.com/rohieb/youtube-dl into rohieb-patch/enhance-tagesschau-regex
---

c356620ec14033969d53ca8a2dd432b79046ee20
diff --cc youtube_dl/extractor/tagesschau.py
index cf1b37a75,4a755c657..636607db5
--- a/youtube_dl/extractor/tagesschau.py
+++ b/youtube_dl/extractor/tagesschau.py
@@@ -8,16 -8,16 +8,16 @@@ from ..utils import parse_filesize, Ext
  
  
  class TagesschauIE(InfoExtractor):
-     _VALID_URL = r'https?://(?:www\.)?tagesschau\.de/multimedia/(?:sendung/ts|video/video)(?P<id>-?[0-9]+)\.html'
+     _VALID_URL = r'https?://(?:www\.)?tagesschau\.de/multimedia/(?:sendung/(ts|tsg|tt|nm|bab/bab)|video/video|tsvorzwanzig)(?P<id>-?[0-9]+)(?:~[-_a-zA-Z0-9]*)?\.html'
  
      _TESTS = [{
 -        'url': 'http://www.tagesschau.de/multimedia/video/video1399128.html',
 -        'md5': 'bcdeac2194fb296d599ce7929dfa4009',
 +        'url': 'http://www.tagesschau.de/multimedia/video/video-102143.html',
 +        'md5': '917a228bc7df7850783bc47979673a09',
          'info_dict': {
 -            'id': '1399128',
 +            'id': '102143',
              'ext': 'mp4',
 -            'title': 'Harald Range, Generalbundesanwalt, zu den Ermittlungen',
 -            'description': 'md5:69da3c61275b426426d711bde96463ab',
 +            'title': 'Regierungsumbildung in Athen: Neue Minister in Griechenland vereidigt',
 +            'description': 'md5:171feccd9d9b3dd54d05d501568f6359',
              'thumbnail': 're:^http:.*\.jpg$',
          },
      }, {