[nrk] Improve extraction and update tests (closes #11571)

[youtube-dl] / youtube_dl / extractor / discoverygo.py

diff --git a/youtube_dl/extractor/discoverygo.py b/youtube_dl/extractor/discoverygo.py
index e86d16d367a9c3e4780f8fb07ff03b0ee5c3b21a..2042493a8c7836ecae4efd23005101cf805116a7 100644 (file)
--- a/youtube_dl/extractor/discoverygo.py
+++ b/youtube_dl/extractor/discoverygo.py
@@ -6,7 +6,6 @@ from ..utils import (
     extract_attributes,
     int_or_none,
     parse_age_limit,
-    unescapeHTML,
     ExtractorError,
 )
 
@@ -49,18 +48,19 @@ class DiscoveryGoIE(InfoExtractor):
                 webpage, 'video container'))
 
         video = self._parse_json(
-            unescapeHTML(container.get('data-video') or container.get('data-json')),
+            container.get('data-video') or container.get('data-json'),
             display_id)
 
         title = video['name']
 
         stream = video.get('stream')
         if not stream:
-            raise ExtractorError(
-                'This video is only available via cable service provider subscription that'
-                ' is not currently supported. You may want to use --cookies.'
-                if video.get('authenticated') is True else 'Unable to find stream',
-                expected=True)
+            if video.get('authenticated') is True:
+                raise ExtractorError(
+                    'This video is only available via cable service provider subscription that'
+                    ' is not currently supported. You may want to use --cookies.', expected=True)
+            else:
+                raise ExtractorError('Unable to find stream')
         STREAM_URL_SUFFIX = 'streamUrl'
         formats = []
         for stream_kind in ('', 'hds'):