Initiate new release.

[youtubedl] / youtube_dl / extractor / veoh.py

diff --git a/youtube_dl/extractor/veoh.py b/youtube_dl/extractor/veoh.py
index d16993daf0ddb8546f838ed59220a7efeb6cdcc6..01e258e32218c227c5de3caf60588baab56e9045 100644 (file)
--- a/youtube_dl/extractor/veoh.py
+++ b/youtube_dl/extractor/veoh.py
@@ -4,9 +4,12 @@ import re
 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_urllib_request,
     compat_urllib_request,

+)
+from ..utils import (

     int_or_none,
     int_or_none,

+    ExtractorError,

 )
 
 
 )
 
 


@@ -48,6 +51,7 @@ class VeohIE(InfoExtractor):
                 'description': 'md5:f5a11c51f8fb51d2315bca0937526891',
                 'uploader': 'newsy-videos',
             },
                 'description': 'md5:f5a11c51f8fb51d2315bca0937526891',
                 'uploader': 'newsy-videos',
             },

+            'skip': 'This video has been deleted.',

         },
     ]
 
         },
     ]
 


@@ -94,8 +98,12 @@ class VeohIE(InfoExtractor):
         if video_id.startswith('v'):
             rsp = self._download_xml(
                 r'http://www.veoh.com/api/findByPermalink?permalink=%s' % video_id, video_id, 'Downloading video XML')
         if video_id.startswith('v'):
             rsp = self._download_xml(
                 r'http://www.veoh.com/api/findByPermalink?permalink=%s' % video_id, video_id, 'Downloading video XML')

-            if rsp.get('stat') == 'ok':
+            stat = rsp.get('stat')
+            if stat == 'ok':

                 return self._extract_video(rsp.find('./videoList/video'))
                 return self._extract_video(rsp.find('./videoList/video'))

+            elif stat == 'fail':
+                raise ExtractorError(
+                    '%s said: %s' % (self.IE_NAME, rsp.find('./errorList/error').get('errorMessage')), expected=True)

 
         webpage = self._download_webpage(url, video_id)
         age_limit = 0
 
         webpage = self._download_webpage(url, video_id)
         age_limit = 0