Update upstream source from tag 'upstream/2020.03.24'

[youtubedl] / youtube_dl / extractor / ehow.py

diff --git a/youtube_dl/extractor/ehow.py b/youtube_dl/extractor/ehow.py
index f8f49a013503cc853c2bf79e345b360af3db7fee..b1cd4f5d4e6fe1dbaaf6ec230aad75947887301d 100644 (file)
--- a/youtube_dl/extractor/ehow.py
+++ b/youtube_dl/extractor/ehow.py
@@ -1,11 +1,7 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-import re
-
-from ..utils import (
-    compat_urllib_parse,
-)

 from .common import InfoExtractor
 from .common import InfoExtractor

+from ..compat import compat_urllib_parse_unquote

 
 
 class EHowIE(InfoExtractor):
 
 
 class EHowIE(InfoExtractor):


@@ -24,12 +20,11 @@ class EHowIE(InfoExtractor):
     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)

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

-        video_url = self._search_regex(r'(?:file|source)=(http[^\'"&]*)',
-            webpage, 'video URL')
-        final_url = compat_urllib_parse.unquote(video_url)
+        video_url = self._search_regex(
+            r'(?:file|source)=(http[^\'"&]*)', webpage, 'video URL')
+        final_url = compat_urllib_parse_unquote(video_url)

         uploader = self._html_search_meta('uploader', webpage)
         title = self._og_search_title(webpage).replace(' | eHow', '')
 
         uploader = self._html_search_meta('uploader', webpage)
         title = self._og_search_title(webpage).replace(' | eHow', '')