Start new release.

[youtubedl] / youtube_dl / extractor / primesharetv.py

diff --git a/youtube_dl/extractor/primesharetv.py b/youtube_dl/extractor/primesharetv.py
index 01cc3d9ea3ff845476a7f7b306c3bfee25078b96..0c1024772c860404209bd3b3f2a183d90c41face 100644 (file)
--- a/youtube_dl/extractor/primesharetv.py
+++ b/youtube_dl/extractor/primesharetv.py
@@ -1,13 +1,11 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-import re
-

 from .common import InfoExtractor
 from .common import InfoExtractor

-from ..compat import (
-    compat_urllib_parse,
-    compat_urllib_request,
+from ..utils import (
+    ExtractorError,
+    sanitized_Request,
+    urlencode_postdata,

 )
 )

-from ..utils import ExtractorError

 
 
 class PrimeShareTVIE(InfoExtractor):
 
 
 class PrimeShareTVIE(InfoExtractor):


@@ -31,12 +29,7 @@ class PrimeShareTVIE(InfoExtractor):
         if '>File not exist<' in webpage:
             raise ExtractorError('Video %s does not exist' % video_id, expected=True)
 
         if '>File not exist<' in webpage:
             raise ExtractorError('Video %s does not exist' % video_id, expected=True)
 

-        fields = dict(re.findall(r'''(?x)<input\s+
-            type="hidden"\s+
-            name="([^"]+)"\s+
-            (?:id="[^"]+"\s+)?
-            value="([^"]*)"
-            ''', webpage))
+        fields = self._hidden_inputs(webpage)

 
         headers = {
             'Referer': url,
 
         headers = {
             'Referer': url,


@@ -48,8 +41,8 @@ class PrimeShareTVIE(InfoExtractor):
             webpage, 'wait time', default=7)) + 1
         self._sleep(wait_time, video_id)
 
             webpage, 'wait time', default=7)) + 1
         self._sleep(wait_time, video_id)
 

-        req = compat_urllib_request.Request(
-            url, compat_urllib_parse.urlencode(fields), headers)
+        req = sanitized_Request(
+            url, urlencode_postdata(fields), headers)

         video_page = self._download_webpage(
             req, video_id, 'Downloading video page')
 
         video_page = self._download_webpage(
             req, video_id, 'Downloading video page')