New upstream version 2016.12.01

[youtubedl] / youtube_dl / extractor / veoh.py

diff --git a/youtube_dl/extractor/veoh.py b/youtube_dl/extractor/veoh.py
index fb132aef68fff7dc9ae3c4098ad2d31a5945825a..0f5d6873808ed2dce5cde2e6239b6973cf809367 100644 (file)
--- a/youtube_dl/extractor/veoh.py
+++ b/youtube_dl/extractor/veoh.py
@@ -5,14 +5,14 @@ import json
 
 from .common import InfoExtractor
 from ..utils import (
 
 from .common import InfoExtractor
 from ..utils import (

-    compat_urllib_request,

     int_or_none,
     ExtractorError,
     int_or_none,
     ExtractorError,

+    sanitized_Request,

 )
 
 
 class VeohIE(InfoExtractor):
 )
 
 
 class VeohIE(InfoExtractor):

-    _VALID_URL = r'http://(?:www\.)?veoh\.com/(?:watch|iphone/#_Watch)/(?P<id>(?:v|yapi-)[\da-zA-Z]+)'
+    _VALID_URL = r'https?://(?:www\.)?veoh\.com/(?:watch|iphone/#_Watch)/(?P<id>(?:v|yapi-)[\da-zA-Z]+)'

 
     _TESTS = [
         {
 
     _TESTS = [
         {


@@ -37,6 +37,7 @@ class VeohIE(InfoExtractor):
                 'uploader': 'afp-news',
                 'duration': 123,
             },
                 'uploader': 'afp-news',
                 'duration': 123,
             },

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

         },
         {
             'url': 'http://www.veoh.com/watch/v69525809F6Nc4frX',
         },
         {
             'url': 'http://www.veoh.com/watch/v69525809F6Nc4frX',


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

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

         },
     ]
 
         },
     ]
 


@@ -107,7 +109,7 @@ class VeohIE(InfoExtractor):
         if 'class="adultwarning-container"' in webpage:
             self.report_age_confirmation()
             age_limit = 18
         if 'class="adultwarning-container"' in webpage:
             self.report_age_confirmation()
             age_limit = 18

-            request = compat_urllib_request.Request(url)
+            request = sanitized_Request(url)

             request.add_header('Cookie', 'confirmedAdult=true')
             webpage = self._download_webpage(request, video_id)
 
             request.add_header('Cookie', 'confirmedAdult=true')
             webpage = self._download_webpage(request, video_id)