aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-13 11:29:08 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-13 11:29:08 +0200
commit44dbe8903580e1e62ea6f3881b2fa469853c4a83 (patch)
treee37407f97519aa86e1295895aa3724a2c2960997 /youtube_dl
parent46720279c28afb646b6ac19bcb11e85bb4bea726 (diff)
downloadyoutube-dl-44dbe8903580e1e62ea6f3881b2fa469853c4a83.tar.xz
Use re.DOTALL by default when searching OpenGraph properties
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/common.py2
-rw-r--r--youtube_dl/extractor/funnyordie.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 0a0c4047d..05b243871 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -265,7 +265,7 @@ class InfoExtractor(object):
def _og_search_property(self, property, html, name=None, **kargs):
if name is None:
name = 'OpenGraph %s' % property
- return self._html_search_regex(self._og_regex(property), html, name, **kargs)
+ return self._html_search_regex(self._og_regex(property), html, name, flags=re.DOTALL, **kargs)
def _og_search_thumbnail(self, html, **kargs):
return self._og_search_property('image', html, 'thumbnail url', fatal=False, **kargs)
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index 64363dcd5..67a7e5f76 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -32,6 +32,6 @@ class FunnyOrDieIE(InfoExtractor):
'url': video_url,
'ext': 'mp4',
'title': title,
- 'description': self._og_search_description(webpage, flags=re.DOTALL),
+ 'description': self._og_search_description(webpage),
}
return [info]