New upstream version 2016.12.01

[youtubedl] / youtube_dl / extractor / tlc.py

diff --git a/youtube_dl/extractor/tlc.py b/youtube_dl/extractor/tlc.py
index abad3ff64b5e519414615d3dd3cf8da345e9a2f3..fd145ba429fbc94ec5582b6100660f2897b25f5f 100644 (file)
--- a/youtube_dl/extractor/tlc.py
+++ b/youtube_dl/extractor/tlc.py
@@ -1,15 +1,19 @@
-# encoding: utf-8
+# coding: utf-8

 from __future__ import unicode_literals
 from __future__ import unicode_literals

+

 import re
 
 from .common import InfoExtractor
 from .brightcove import BrightcoveLegacyIE
 import re
 
 from .common import InfoExtractor
 from .brightcove import BrightcoveLegacyIE

-from ..compat import compat_parse_qs
+from ..compat import (
+    compat_parse_qs,
+    compat_urlparse,
+)

 
 
 class TlcDeIE(InfoExtractor):
     IE_NAME = 'tlc.de'
 
 
 class TlcDeIE(InfoExtractor):
     IE_NAME = 'tlc.de'

-    _VALID_URL = r'https?://www\.tlc\.de/(?:[^/]+/)*videos/(?P<title>[^/?#]+)?(?:.*#(?P<id>\d+))?'
+    _VALID_URL = r'https?://(?:www\.)?tlc\.de/(?:[^/]+/)*videos/(?P<title>[^/?#]+)?(?:.*#(?P<id>\d+))?'

 
     _TEST = {
         'url': 'http://www.tlc.de/sendungen/breaking-amish/videos/#3235167922001',
 
     _TEST = {
         'url': 'http://www.tlc.de/sendungen/breaking-amish/videos/#3235167922001',


@@ -35,5 +39,5 @@ class TlcDeIE(InfoExtractor):
             title = mobj.group('title')
             webpage = self._download_webpage(url, title)
             brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)
             title = mobj.group('title')
             webpage = self._download_webpage(url, title)
             brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)

-            brightcove_id = compat_parse_qs(brightcove_legacy_url)['@videoPlayer'][0]
+            brightcove_id = compat_parse_qs(compat_urlparse.urlparse(brightcove_legacy_url).query)['@videoPlayer'][0]

         return self.url_result(self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew', brightcove_id)
         return self.url_result(self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew', brightcove_id)