projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'chilloutzone'
[youtube-dl]
/
youtube_dl
/
extractor
/
bloomberg.py
diff --git
a/youtube_dl/extractor/bloomberg.py
b/youtube_dl/extractor/bloomberg.py
index 3666a780b9209da0125d319e3851f40a05bc4e4f..df2cff81c603b5d85d0f6c82a0f36af509002301 100644
(file)
--- a/
youtube_dl/extractor/bloomberg.py
+++ b/
youtube_dl/extractor/bloomberg.py
@@
-1,10
+1,11
@@
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
+from .ooyala import OoyalaIE
class BloombergIE(InfoExtractor):
class BloombergIE(InfoExtractor):
- _VALID_URL = r'https?://www\.bloomberg\.com/video/(?P<name>.+?).html'
+ _VALID_URL = r'https?://www\.bloomberg\.com/video/(?P<name>.+?)
\
.html'
_TEST = {
u'url': u'http://www.bloomberg.com/video/shah-s-presentation-on-foreign-exchange-strategies-qurhIVlJSB6hzkVi229d8g.html',
_TEST = {
u'url': u'http://www.bloomberg.com/video/shah-s-presentation-on-foreign-exchange-strategies-qurhIVlJSB6hzkVi229d8g.html',
@@
-23,5
+24,5
@@
class BloombergIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url)
name = mobj.group('name')
webpage = self._download_webpage(url, name)
mobj = re.match(self._VALID_URL, url)
name = mobj.group('name')
webpage = self._download_webpage(url, name)
- ooyala_url = self._
og_search_video_url
(webpage)
- return self.url_result(ooyala_url,
ie='Ooyala'
)
+ ooyala_url = self._
twitter_search_player
(webpage)
+ return self.url_result(ooyala_url,
OoyalaIE.ie_key()
)