From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 25 Aug 2013 22:45:22 +0000 (-0700)
Subject: Merge pull request #1310 from rzhxeo/rtlnow
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=90648143c315cc65b2449b72aec5025ff4e9ac17;p=youtube-dl

Merge pull request #1310 from rzhxeo/rtlnow

Add support for http://superrtlnow.de
---

90648143c315cc65b2449b72aec5025ff4e9ac17
diff --cc youtube_dl/extractor/rtlnow.py
index 2f134e6a7,67f341bcc..7bb236c2b
--- a/youtube_dl/extractor/rtlnow.py
+++ b/youtube_dl/extractor/rtlnow.py
@@@ -2,14 -2,11 +2,14 @@@
  import re
  
  from .common import InfoExtractor
 -from ..utils import ExtractorError
 +from ..utils import (
 +    clean_html,
 +    ExtractorError,
 +)
  
  class RTLnowIE(InfoExtractor):
-     """Information Extractor for RTLnow, RTL2now and VOXnow"""
-     _VALID_URL = r'(?:http://)?(?P<url>(?P<base_url>rtl(?:(?P<is_rtl2>2)|-)now\.rtl(?(is_rtl2)2|)\.de/|(?:www\.)?voxnow\.de/)[a-zA-Z0-9-]+/[a-zA-Z0-9-]+\.php\?(?:container_id|film_id)=(?P<video_id>[0-9]+)&player=1(?:&season=[0-9]+)?(?:&.*)?)'
+     """Information Extractor for RTL NOW, RTL2 NOW, SUPER RTL NOW and VOX NOW"""
+     _VALID_URL = r'(?:http://)?(?P<url>(?P<base_url>rtl-now\.rtl\.de/|rtl2now\.rtl2\.de/|(?:www\.)?voxnow\.de/|(?:www\.)?superrtlnow\.de/)[a-zA-Z0-9-]+/[a-zA-Z0-9-]+\.php\?(?:container_id|film_id)=(?P<video_id>[0-9]+)&player=1(?:&season=[0-9]+)?(?:&.*)?)'
      _TESTS = [{
          u'url': u'http://rtl-now.rtl.de/ahornallee/folge-1.php?film_id=90419&player=1&season=1',
          u'file': u'90419.flv',