From: Remita Amine <remitamine@gmail.com>
Date: Sun, 14 Aug 2016 21:45:43 +0000 (+0100)
Subject: [uplynk,viceland] update tests and change uplynk extractors names
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=24eb13b1c6889cc4399b854cde931e5a5c5f5346;p=youtube-dl

[uplynk,viceland] update tests and change uplynk extractors names
---

diff --git a/youtube_dl/extractor/uplynk.py b/youtube_dl/extractor/uplynk.py
index 4313bc9cb..ae529f690 100644
--- a/youtube_dl/extractor/uplynk.py
+++ b/youtube_dl/extractor/uplynk.py
@@ -11,6 +11,7 @@ from ..utils import (
 
 
 class UplynkIE(InfoExtractor):
+    IE_NAME = 'uplynk'
     _VALID_URL = r'https?://.*?\.uplynk\.com/(?P<path>ext/[0-9a-f]{32}/(?P<external_id>[^/?&]+)|(?P<id>[0-9a-f]{32}))\.(?:m3u8|json)(?:.*?\bpbs=(?P<session_id>[^&]+))?'
     _TEST = {
         'url': 'http://content.uplynk.com/e89eaf2ce9054aa89d92ddb2d817a52e.m3u8',
@@ -54,7 +55,9 @@ class UplynkIE(InfoExtractor):
 
 
 class UplynkPreplayIE(UplynkIE):
+    IE_NAME = 'uplynk:preplay'
     _VALID_URL = r'https?://.*?\.uplynk\.com/preplay2?/(?P<path>ext/[0-9a-f]{32}/(?P<external_id>[^/?&]+)|(?P<id>[0-9a-f]{32}))\.json'
+    _TEST = None
 
     def _real_extract(self, url):
         path, external_id, video_id = re.match(self._VALID_URL, url).groups()
diff --git a/youtube_dl/extractor/viceland.py b/youtube_dl/extractor/viceland.py
index 814a72fa2..da766d8db 100644
--- a/youtube_dl/extractor/viceland.py
+++ b/youtube_dl/extractor/viceland.py
@@ -36,7 +36,7 @@ class VicelandIE(AdobePass):
             # m3u8 download
             'skip_download': True,
         },
-        'add_ie': ['UplynkPreplay', 'Uplynk'],
+        'add_ie': ['UplynkPreplay'],
     }
 
     def _real_extract(self, url):