Merge tag 'upstream/2015.07.21'

[youtubedl] / youtube_dl / extractor / ynet.py

diff --git a/youtube_dl/extractor/ynet.py b/youtube_dl/extractor/ynet.py
index 9cd7989cc553b58043425cc5b852b258ee4834aa..869f3e8190ca0b751366a85f142a0b49fe294fa1 100644 (file)
--- a/youtube_dl/extractor/ynet.py
+++ b/youtube_dl/extractor/ynet.py
@@ -5,7 +5,7 @@ import re
 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor

-from ..utils import compat_urllib_parse
+from ..compat import compat_urllib_parse_unquote_plus

 
 
 class YnetIE(InfoExtractor):
 
 
 class YnetIE(InfoExtractor):


@@ -34,7 +34,7 @@ class YnetIE(InfoExtractor):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 

-        content = compat_urllib_parse.unquote_plus(self._og_search_video_url(webpage))
+        content = compat_urllib_parse_unquote_plus(self._og_search_video_url(webpage))

         config = json.loads(self._search_regex(r'config=({.+?})$', content, 'video config'))
         f4m_url = config['clip']['url']
         title = self._og_search_title(webpage)
         config = json.loads(self._search_regex(r'config=({.+?})$', content, 'video config'))
         f4m_url = config['clip']['url']
         title = self._og_search_title(webpage)


@@ -47,4 +47,4 @@ class YnetIE(InfoExtractor):
             'title': title,
             'formats': self._extract_f4m_formats(f4m_url, video_id),
             'thumbnail': self._og_search_thumbnail(webpage),
             'title': title,
             'formats': self._extract_f4m_formats(f4m_url, video_id),
             'thumbnail': self._og_search_thumbnail(webpage),

-        }
\ No newline at end of file
+        }