Merge pull request #3167 from Schnouki/motherless

* mother/motherless:
  [Motherless] Add new extractor

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 4ff2d379892d6820e987b4b4850f2c7c47fbbf76..f910d1a263452eb4e7497cc5cac0f0f8e3a88144 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -63,6 +63,7 @@ from .dailymotion import (
 from .daum import DaumIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE
+from .drtv import DRTVIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .divxstage import DivxStageIE

diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py
index b528a9ec50ca6c2dac1a52fe66de2cd66194dd23..b42102f3d1c44d1a94869a6bcc5d13515ede2d44 100644 (file)
--- a/youtube_dl/extractor/arte.py
+++ b/youtube_dl/extractor/arte.py
@@ -111,7 +111,7 @@ class ArteTVPlus7IE(InfoExtractor):
         if not formats:
             # Some videos are only available in the 'Originalversion'
             # they aren't tagged as being in French or German
-            if all(f['versionCode'] == 'VO' for f in all_formats):
+            if all(f['versionCode'] == 'VO' or f['versionCode'] == 'VA' for f in all_formats):
                 formats = all_formats
             else:
                 raise ExtractorError(u'The formats list is empty')
@@ -189,9 +189,10 @@ class ArteTVFutureIE(ArteTVPlus7IE):
     _TEST = {
         'url': 'http://future.arte.tv/fr/sujet/info-sciences#article-anchor-7081',
         'info_dict': {
-            'id': '050940-003',
+            'id': '5201',
             'ext': 'mp4',
             'title': 'Les champignons au secours de la planète',
+            'upload_date': '20131101',
         },
     }
 

diff --git a/youtube_dl/extractor/drtv.py b/youtube_dl/extractor/drtv.py
index 60f073ff02c8fe07c7e2cc3a0a930198f26945bb..cdccfd376b80ee5ebc61c25ab4cd00e12dcfc458 100644 (file)
--- a/youtube_dl/extractor/drtv.py
+++ b/youtube_dl/extractor/drtv.py
@@ -4,7 +4,7 @@ import re
 
 from .subtitles import SubtitlesInfoExtractor
 from .common import ExtractorError
-from..utils import parse_iso8601
+from ..utils import parse_iso8601
 
 
 class DRTVIE(SubtitlesInfoExtractor):