[ultimedia] keep direct support for ultimedia videos

[youtube-dl] / youtube_dl / extractor / condenast.py

diff --git a/youtube_dl/extractor/condenast.py b/youtube_dl/extractor/condenast.py
index 22c66da266396e4a0cd06473e4888fe701ccf9e7..d6949ca28f9605fc69c0ee2adb032217903da393 100644 (file)
--- a/youtube_dl/extractor/condenast.py
+++ b/youtube_dl/extractor/condenast.py
@@ -26,7 +26,7 @@ class CondeNastIE(InfoExtractor):
         'allure': 'Allure',
         'architecturaldigest': 'Architectural Digest',
         'arstechnica': 'Ars Technica',
-        'bonappetit': 'Bon Appetit',
+        'bonappetit': 'Bon Appétit',
         'brides': 'Brides',
         'cnevids': 'Condé Nast',
         'cntraveler': 'Condé Nast Traveler',
@@ -44,7 +44,7 @@ class CondeNastIE(InfoExtractor):
         'wmagazine': 'W Magazine',
     }
 
-    _VALID_URL = r'http://(video|www|player)\.(?P<site>%s)\.com/(?P<type>watch|series|video|embed)/(?P<id>[^/?#]+)' % '|'.join(_SITES.keys())
+    _VALID_URL = r'http://(?:video|www|player)\.(?P<site>%s)\.com/(?P<type>watch|series|video|embed)/(?P<id>[^/?#]+)' % '|'.join(_SITES.keys())
     IE_DESC = 'Condé Nast media group: %s' % ', '.join(sorted(_SITES.values()))
 
     EMBED_URL = r'(?:https?:)?//player\.(?P<site>%s)\.com/(?P<type>embed)/.+?' % '|'.join(_SITES.keys())
@@ -97,7 +97,7 @@ class CondeNastIE(InfoExtractor):
         info_url = base_info_url + data
         info_page = self._download_webpage(info_url, video_id,
                                            'Downloading video info')
-        video_info = self._search_regex(r'var\s*video\s*=\s*({.+?});', info_page, 'video info')
+        video_info = self._search_regex(r'var\s+video\s*=\s*({.+?});', info_page, 'video info')
         video_info = self._parse_json(video_info, video_id)
 
         formats = [{