From 14d7dccccd2d5736448bc97ac47504164d79b420 Mon Sep 17 00:00:00 2001 From: Matthias Roos Date: Fri, 5 Jul 2019 21:03:34 +0200 Subject: [PATCH] Revert "[3sat] now added to zdf extractor" This reverts commit 2161db38787072dcb2187d45951fe16221fa1021. --- youtube_dl/extractor/extractors.py | 2 +- youtube_dl/extractor/{zdf3sat.py => zdf.py} | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) rename youtube_dl/extractor/{zdf3sat.py => zdf.py} (98%) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index e1b6927e8..b1ed8a4b2 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -1522,6 +1522,6 @@ from .zattoo import ( ZattooIE, ZattooLiveIE, ) -from .zdf3sat import ZDFIE, ZDFChannelIE +from .zdf import ZDFIE, ZDFChannelIE from .zingmp3 import ZingMp3IE from .zype import ZypeIE diff --git a/youtube_dl/extractor/zdf3sat.py b/youtube_dl/extractor/zdf.py similarity index 98% rename from youtube_dl/extractor/zdf3sat.py rename to youtube_dl/extractor/zdf.py index 6c22d24c4..afa3f6c47 100644 --- a/youtube_dl/extractor/zdf3sat.py +++ b/youtube_dl/extractor/zdf.py @@ -39,7 +39,7 @@ class ZDFBaseIE(InfoExtractor): class ZDFIE(ZDFBaseIE): - _VALID_URL = r'https?://www\.(?:zdf|3sat)\.de/(?:[^/]+/)*(?P[^/?]+)\.html' + _VALID_URL = r'https?://www\.zdf\.de/(?:[^/]+/)*(?P[^/?]+)\.html' _QUALITIES = ('auto', 'low', 'med', 'high', 'veryhigh') _TESTS = [{ @@ -53,9 +53,6 @@ class ZDFIE(ZDFBaseIE): 'timestamp': 1465021200, 'upload_date': '20160604', }, - }, { - 'url': 'https://www.3sat.de/kultur/kulturdoku/der-gugelhupf-koenig-der-kuchen-100.html', - 'only_matching': True, }, { 'url': 'https://www.zdf.de/service-und-hilfe/die-neue-zdf-mediathek/zdfmediathek-trailer-100.html', 'only_matching': True,