From 744fd94d1b3e981b9a2e94c137a60bedf4c74557 Mon Sep 17 00:00:00 2001
From: Kay B <>
Date: Thu, 1 Mar 2018 02:18:32 +0100
Subject: [PATCH 1/2] [heise] delegate to KalturaIE when necessary (#14961)

---
 youtube_dl/extractor/heise.py | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/youtube_dl/extractor/heise.py b/youtube_dl/extractor/heise.py
index 82e11a7d8..8b652d5b0 100644
--- a/youtube_dl/extractor/heise.py
+++ b/youtube_dl/extractor/heise.py
@@ -3,11 +3,14 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from .youtube import YoutubeIE
+from .kaltura import KalturaIE
 from ..utils import (
     determine_ext,
     int_or_none,
     parse_iso8601,
     xpath_text,
+    smuggle_url,
+    ExtractorError,
 )
 
 
@@ -42,6 +45,16 @@ class HeiseIE(InfoExtractor):
         'params': {
             'skip_download': True,
         },
+    }, {
+        'url': 'https://www.heise.de/video/artikel/nachgehakt-Wie-sichert-das-c-t-Tool-Restric-tor-Windows-10-ab-3700244.html',
+        'md5': '4b58058b46625bdbd841fc2804df95fc',
+        'info_dict': {
+            'id': '1_ntrmio2s',
+            'timestamp': 1512470717,
+            'upload_date': '20171205',
+            'ext': 'mp4',
+            'title': 'ct10 nachgehakt hos restrictor',
+        },
     }, {
         'url': 'http://www.heise.de/ct/artikel/c-t-uplink-3-3-Owncloud-Tastaturen-Peilsender-Smartphone-2403911.html',
         'only_matching': True,
@@ -67,9 +80,16 @@ class HeiseIE(InfoExtractor):
         if yt_urls:
             return self.playlist_from_matches(yt_urls, video_id, title, ie=YoutubeIE.ie_key())
 
-        container_id = self._search_regex(
-            r'<div class="videoplayerjw"[^>]+data-container="([0-9]+)"',
-            webpage, 'container ID')
+        try:
+            container_id = self._search_regex(
+                r'<div class="videoplayerjw"[^>]+data-container="([0-9]+)"',
+                webpage, 'container ID')
+
+        except ExtractorError:
+            kaltura_url = KalturaIE._extract_url(webpage)
+            if kaltura_url:
+                return self.url_result(smuggle_url(kaltura_url, {'source_url': url}), KalturaIE.ie_key())
+
         sequenz_id = self._search_regex(
             r'<div class="videoplayerjw"[^>]+data-sequenz="([0-9]+)"',
             webpage, 'sequenz ID')

From 4cf0d337280726d860ee26200d568ce9c9b2a3b2 Mon Sep 17 00:00:00 2001
From: Kay B <>
Date: Mon, 5 Mar 2018 22:43:18 +0100
Subject: [PATCH 2/2] [heise] incorporate pull request review

---
 youtube_dl/extractor/heise.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/youtube_dl/extractor/heise.py b/youtube_dl/extractor/heise.py
index 8b652d5b0..8f49f52ef 100644
--- a/youtube_dl/extractor/heise.py
+++ b/youtube_dl/extractor/heise.py
@@ -2,15 +2,14 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from .youtube import YoutubeIE
 from .kaltura import KalturaIE
+from .youtube import YoutubeIE
 from ..utils import (
     determine_ext,
     int_or_none,
     parse_iso8601,
-    xpath_text,
     smuggle_url,
-    ExtractorError,
+    xpath_text,
 )
 
 
@@ -55,6 +54,9 @@ class HeiseIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'ct10 nachgehakt hos restrictor',
         },
+        'params': {
+            'skip_download': True,
+        },
     }, {
         'url': 'http://www.heise.de/ct/artikel/c-t-uplink-3-3-Owncloud-Tastaturen-Peilsender-Smartphone-2403911.html',
         'only_matching': True,
@@ -80,15 +82,13 @@ class HeiseIE(InfoExtractor):
         if yt_urls:
             return self.playlist_from_matches(yt_urls, video_id, title, ie=YoutubeIE.ie_key())
 
-        try:
-            container_id = self._search_regex(
-                r'<div class="videoplayerjw"[^>]+data-container="([0-9]+)"',
-                webpage, 'container ID')
+        kaltura_url = KalturaIE._extract_url(webpage)
+        if kaltura_url:
+            return self.url_result(smuggle_url(kaltura_url, {'source_url': url}), KalturaIE.ie_key())
 
-        except ExtractorError:
-            kaltura_url = KalturaIE._extract_url(webpage)
-            if kaltura_url:
-                return self.url_result(smuggle_url(kaltura_url, {'source_url': url}), KalturaIE.ie_key())
+        container_id = self._search_regex(
+            r'<div class="videoplayerjw"[^>]+data-container="([0-9]+)"',
+            webpage, 'container ID')
 
         sequenz_id = self._search_regex(
             r'<div class="videoplayerjw"[^>]+data-sequenz="([0-9]+)"',