From: Johny Mo Swag <johnymo@me.com>
Date: Mon, 29 Jul 2013 21:39:14 +0000 (-0700)
Subject: using re.search
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d75654c15ea67424abf0fe69fdfb50e2a2d50101;p=youtube-dl

using re.search
---

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:')