Merge tag 'upstream/2015.07.21'

[youtubedl] / youtube_dl / extractor / mooshare.py

diff --git a/youtube_dl/extractor/mooshare.py b/youtube_dl/extractor/mooshare.py
index 34a4bec3a0d1fb91208acce4684a4078188b847d..7603af5e2f567bdbba116c8fca26591e7f2a3b1c 100644 (file)
--- a/youtube_dl/extractor/mooshare.py
+++ b/youtube_dl/extractor/mooshare.py
@@ -1,14 +1,15 @@
 from __future__ import unicode_literals
 
 import re
 from __future__ import unicode_literals
 
 import re

-import time

 
 from .common import InfoExtractor
 
 from .common import InfoExtractor

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

     compat_urllib_request,
     compat_urllib_parse,
 )
     compat_urllib_request,
     compat_urllib_parse,
 )

+from ..utils import (
+    ExtractorError,
+)

 
 
 class MooshareIE(InfoExtractor):
 
 
 class MooshareIE(InfoExtractor):


@@ -43,9 +44,7 @@ class MooshareIE(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)

         page = self._download_webpage(url, video_id, 'Downloading page')
 
         if re.search(r'>Video Not Found or Deleted<', page) is not None:
         page = self._download_webpage(url, video_id, 'Downloading page')
 
         if re.search(r'>Video Not Found or Deleted<', page) is not None:


@@ -64,8 +63,7 @@ class MooshareIE(InfoExtractor):
             'http://mooshare.biz/%s' % video_id, compat_urllib_parse.urlencode(download_form))
         request.add_header('Content-Type', 'application/x-www-form-urlencoded')
 
             'http://mooshare.biz/%s' % video_id, compat_urllib_parse.urlencode(download_form))
         request.add_header('Content-Type', 'application/x-www-form-urlencoded')
 

-        self.to_screen('%s: Waiting for timeout' % video_id)
-        time.sleep(5)
+        self._sleep(5, video_id)

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