about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohny Mo Swag <johnymo@me.com>2013-07-29 14:39:14 -0700
committerJohny Mo Swag <johnymo@me.com>2013-07-29 14:39:14 -0700
commitd75654c15ea67424abf0fe69fdfb50e2a2d50101 (patch)
treecba7704aa959dd648be152d22ec9d8059aad6323
parent579e2691feca6173c5a84c1fb4fe7a213386c223 (diff)
downloadyoutube-dl-d75654c15ea67424abf0fe69fdfb50e2a2d50101.tar.gz
youtube-dl-d75654c15ea67424abf0fe69fdfb50e2a2d50101.tar.xz
youtube-dl-d75654c15ea67424abf0fe69fdfb50e2a2d50101.zip
using re.search
-rw-r--r--youtube_dl/extractor/worldstarhiphop.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py
index a93928f3c..8a52c7a99 100644
--- a/youtube_dl/extractor/worldstarhiphop.py
+++ b/youtube_dl/extractor/worldstarhiphop.py
@@ -21,17 +21,17 @@ class WorldStarHipHopIE(InfoExtractor):
 
         webpage_src = self._download_webpage(url, video_id)
 
-        video_url = self._search_regex(r'videoId=(.*?)&amp?',
-            webpage_src, u'video URL', fatal=False)
+        video_url = re.search(r'videoId=(.*?)&amp?',
+            webpage_src)
         
         if video_url:
             self.to_screen(u'Vevo video detected:')
-            return self.url_result('vevo:%s' % video_url, ie='Vevo')
+            return self.url_result('vevo:%s' % video_url.group(1), ie='Vevo')
 
         video_url = self._search_regex(r'so\.addVariable\("file","(.*?)"\)',
             webpage_src, u'video URL')
 
-        if video_url == None:
+        if video_url is None:
             video_url = self._search_regex(r'videoId=(.*?)&amp?',
                 webpage_src, u'video URL')
             self.to_screen(u'Vevo video detected:')