Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2025-01-08 14:17:54 +01:00
Code Issues Releases Wiki Activity

Revert "[3sat] now added to zdf extractor"

Browse Source 
This reverts commit 2161db3878.
This commit is contained in:
Matthias Roos 2019-07-05 21:03:34 +02:00
parent 2161db3878
commit 14d7dccccd
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/extractors.py
View File

@ -1522,6 +1522,6 @@ from .zattoo import (
ZattooIE, ZattooIE,
ZattooLiveIE, ZattooLiveIE,
) )
from .zdf3sat import ZDFIE, ZDFChannelIE from .zdf import ZDFIE, ZDFChannelIE
from .zingmp3 import ZingMp3IE from .zingmp3 import ZingMp3IE
from .zype import ZypeIE from .zype import ZypeIE

5
youtube_dl/extractor/zdf3sat.py → youtube_dl/extractor/zdf.py
View File

@ -39,7 +39,7 @@ class ZDFBaseIE(InfoExtractor):
class ZDFIE(ZDFBaseIE): class ZDFIE(ZDFBaseIE):
_VALID_URL = r'https?://www\.(?:zdf|3sat)\.de/(?:[^/]+/)*(?P<id>[^/?]+)\.html' _VALID_URL = r'https?://www\.zdf\.de/(?:[^/]+/)*(?P<id>[^/?]+)\.html'
_QUALITIES = ('auto', 'low', 'med', 'high', 'veryhigh') _QUALITIES = ('auto', 'low', 'med', 'high', 'veryhigh')
_TESTS = [{ _TESTS = [{
@ -53,9 +53,6 @@ class ZDFIE(ZDFBaseIE):
'timestamp': 1465021200, 'timestamp': 1465021200,
'upload_date': '20160604', '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', 'url': 'https://www.zdf.de/service-und-hilfe/die-neue-zdf-mediathek/zdfmediathek-trailer-100.html',
'only_matching': True, 'only_matching': True,