Use re.DOTALL by default when searching OpenGraph properties

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 0a0c4047d79314f497b13106ec105d2b525fb0f5..05b24387165fd5678cd77a7e37918bb2ce354d51 100644 (file)
--- 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 64363dcd51d687fe749ead55f5fc0efc4c04d31c..67a7e5f76fc604ae058a8e05842b02feb7fecffe 100644 (file)
--- 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]