youtube-dl

commit 5c13c285660c2811206c5bb29acf43b114ab31e3
parent f70e9229e623eb041ad514605ceca484b176b850
Author: Remita Amine <remitamine@gmail.com>
Date:   Thu, 25 Aug 2016 09:55:23 +0100

raise unexpected error when no stream found

Diffstat:
M
youtube_dl/extractor/adultswim.py
 | 
11
++++++-----
M
youtube_dl/extractor/discoverygo.py
 | 
11
++++++-----

2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dl/extractor/adultswim.py
@@ -162,11 +162,12 @@ class AdultSwimIE(InfoExtractor):
             elif video_info.get('videoPlaybackID'):
                 segment_ids = [video_info['videoPlaybackID']]
             else:
-                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_info.get('auth') is True else 'Unable to find stream or clips',
-                    expected=True)
+                if video_info.get('auth') 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 or clips')
 
         episode_id = video_info['id']
         episode_title = video_info['title']
diff --git a/youtube_dl/extractor/discoverygo.py b/youtube_dl/extractor/discoverygo.py
@@ -56,11 +56,12 @@ class DiscoveryGoIE(InfoExtractor):
 
         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'):