From: remitamine Date: Mon, 21 Dec 2015 10:18:32 +0000 (+0100) Subject: Merge branch 'bleacherreport' of github.com:remitamine/youtube-dl into remitamine... X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=2c28da8e05f018d021d52dd1e8bc44bfbb6dbf00 Merge branch 'bleacherreport' of github.com:remitamine/youtube-dl into remitamine-bleacherreport --- 2c28da8e05f018d021d52dd1e8bc44bfbb6dbf00 diff --cc youtube_dl/extractor/__init__.py index add1df023,4d65ece94..760b65441 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@@ -61,7 -54,12 +61,11 @@@ from .beatportpro import BeatportProI from .bet import BetIE from .bild import BildIE from .bilibili import BiliBiliIE + from .bleacherreport import ( + BleacherReportIE, + BleacherReportCMSIE, + ) from .blinkx import BlinkxIE -from .bliptv import BlipTVIE, BlipTVUserIE from .bloomberg import BloombergIE from .bpb import BpbIE from .br import BRIE diff --cc youtube_dl/extractor/dramafever.py index d836c1a6c,2a4310754..60ed438f8 --- a/youtube_dl/extractor/dramafever.py +++ b/youtube_dl/extractor/dramafever.py @@@ -12,10 -13,6 +12,7 @@@ from ..compat import from ..utils import ( ExtractorError, clean_html, - determine_ext, - int_or_none, - parse_iso8601, + sanitized_Request, )