[godtv] Remove extractor (closes #13175)

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

diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py
index 21d336ca702ac4223a52722cab46898f42a3ac78..56baef29d4f644c1b52c7d2e5f26fcca7e89e9e4 100644 (file)
--- a/youtube_dl/extractor/arte.py
+++ b/youtube_dl/extractor/arte.py
@@ -180,7 +180,7 @@ class ArteTVBaseIE(InfoExtractor):
 
 class ArteTVPlus7IE(ArteTVBaseIE):
     IE_NAME = 'arte.tv:+7'
-    _VALID_URL = r'https?://(?:(?:www|sites)\.)?arte\.tv/[^/]+/(?P<lang>fr|de|en|es)/(?:[^/]+/)*(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:(?:www|sites)\.)?arte\.tv/(?:[^/]+/)?(?P<lang>fr|de|en|es)/(?:videos/)?(?:[^/]+/)*(?P<id>[^/?#&]+)'
 
     _TESTS = [{
         'url': 'http://www.arte.tv/guide/de/sendungen/XEN/xenius/?vid=055918-015_PLUS7-D',
@@ -188,6 +188,9 @@ class ArteTVPlus7IE(ArteTVBaseIE):
     }, {
         'url': 'http://sites.arte.tv/karambolage/de/video/karambolage-22',
         'only_matching': True,
+    }, {
+        'url': 'http://www.arte.tv/de/videos/048696-000-A/der-kluge-bauch-unser-zweites-gehirn',
+        'only_matching': True,
     }]
 
     @classmethod
@@ -408,15 +411,15 @@ class ArteTVEmbedIE(ArteTVPlus7IE):
         lang = mobj.group('lang')
         json_url = mobj.group('json_url')
         return self._extract_from_json_url(json_url, video_id, lang)
-  
-        
-class ArteTVOperaPlatformIE(ArteTVPlus7IE):
-    IE_NAME = 'arte.tv:operaplatform'
-    _VALID_URL = r'https?://www.theoperaplatform.eu/(?P<lang>fr|de|en|es)/(?P<id>[^/?#&]+)'
+
+
+class TheOperaPlatformIE(ArteTVPlus7IE):
+    IE_NAME = 'theoperaplatform'
+    _VALID_URL = r'https?://(?:www\.)?theoperaplatform\.eu/(?P<lang>fr|de|en|es)/(?P<id>[^/?#&]+)'
 
     _TESTS = [{
         'url': 'http://www.theoperaplatform.eu/de/opera/verdi-otello',
-        'md5': '80f5d3fc97957b5dbfc1ddfde93b8098',
+        'md5': '970655901fa2e82e04c00b955e9afe7b',
         'info_dict': {
             'id': '060338-009-A',
             'ext': 'mp4',