aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/__init__.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2014-09-03 21:08:50 +0700
committerSergey M․ <dstftw@gmail.com>2014-09-03 21:08:50 +0700
commit88fc294f7f03ce6af9787c6d9c3bad7fc5fade10 (patch)
tree5e2d883bdbc86dc68b3e1f23181fefb68dcb2276 /youtube_dl/extractor/__init__.py
parent884ae747859a9819292f9a0199a3d76b0cb1d98f (diff)
parenta232bb9551b1b99fed159d3395b7be363258fb21 (diff)
downloadyoutube-dl-88fc294f7f03ce6af9787c6d9c3bad7fc5fade10.tar.xz
Merge branch 'peugeot-tnaflix'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r--youtube_dl/extractor/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 6c7668fe2..d54ad8057 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -86,7 +86,7 @@ from .ellentv import (
EllenTVClipsIE,
)
from .elpais import ElPaisIE
-from .empflix import EmpflixIE
+from .empflix import EMPFlixIE
from .engadget import EngadgetIE
from .eporner import EpornerIE
from .escapist import EscapistIE
@@ -348,6 +348,7 @@ from .theplatform import ThePlatformIE
from .thisav import ThisAVIE
from .tinypic import TinyPicIE
from .tlc import TlcIE, TlcDeIE
+from .tnaflix import TNAFlixIE
from .toutv import TouTvIE
from .toypics import ToypicsUserIE, ToypicsIE
from .traileraddict import TrailerAddictIE