diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-06-28 23:05:49 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-06-28 23:05:49 +0600 |
| commit | e8b9ee5e08eee026016b4c06e7d47abaa82c5031 (patch) | |
| tree | e6643b57b2a590fdf8dda1fa7ccdd064df989969 /youtube_dl/extractor/__init__.py | |
| parent | ac0474f89d3e6f8c8c1fb3223a16a18a2fd02bcb (diff) | |
| parent | d16154d16327907279eff48a4018c495726d401a (diff) | |
| download | youtube-dl-e8b9ee5e08eee026016b4c06e7d47abaa82c5031.tar.xz | |
Merge branch 'gebn-moviefap'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index c0a825e8a..d44339200 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -144,7 +144,6 @@ from .ellentv import ( ) from .elpais import ElPaisIE from .embedly import EmbedlyIE -from .empflix import EMPFlixIE from .engadget import EngadgetIE from .eporner import EpornerIE from .eroprofile import EroProfileIE @@ -577,7 +576,11 @@ from .tmz import ( TMZIE, TMZArticleIE, ) -from .tnaflix import TNAFlixIE +from .tnaflix import ( + TNAFlixIE, + EMPFlixIE, + MovieFapIE, +) from .thvideo import ( THVideoIE, THVideoPlaylistIE |