[dispeak] Several fixes

diff --git a/youtube_dl/extractor/dispeak.py b/youtube_dl/extractor/dispeak.py
index c74fa7e0725bbe94cb1980695585889bedeffab4..aaa2f8cd19b03495af30f8989690df966fe5220d 100644 (file)
--- a/youtube_dl/extractor/dispeak.py
+++ b/youtube_dl/extractor/dispeak.py
@@ -13,10 +13,10 @@ from ..utils import (
 
 
 class DigitalSpeakingIE(InfoExtractor):
-    _VALID_URL = r'http://(?:evt\.dispeak|events\.digitallyspeaking)\.com/([^/]+/)+xml/(?P<id>[^.]+).xml'
+    _VALID_URL = r'https?://(?:evt\.dispeak|events\.digitallyspeaking)\.com/(?:[^/]+/)+xml/(?P<id>[^.]+)\.xml'
 
     _TESTS = [{
-        # From http://evt.dispeak.com/ubm/gdc/sf16/xml/840376_BQRC.xml
+        # From http://gdcvault.com/play/1023460/Tenacious-Design-and-The-Interface
         'url': 'http://evt.dispeak.com/ubm/gdc/sf16/xml/840376_BQRC.xml',
         'md5': 'a8efb6c31ed06ca8739294960b2dbabd',
         'info_dict': {

diff --git a/youtube_dl/extractor/gdcvault.py b/youtube_dl/extractor/gdcvault.py
index 5d45faf859dcbf14cf361ab36758dc9eee851063..373053a66f4012e1c33c87a0446c3a3eecc6e3f5 100644 (file)
--- a/youtube_dl/extractor/gdcvault.py
+++ b/youtube_dl/extractor/gdcvault.py
@@ -157,5 +157,5 @@ class GDCVaultIE(InfoExtractor):
             'id': video_id,
             'display_id': display_id,
             'url': '%s/xml/%s' % (xml_root, xml_name),
-            'ie': 'DigitalSpeaking',
+            'ie_key': 'DigitalSpeaking',
         }

diff --git a/youtube_dl/extractor/gputechconf.py b/youtube_dl/extractor/gputechconf.py
index 359b348e4fd7df58780bc5c5e623ed443da40553..14daef7a8c127c4bb88cf9b336a112e7f9db6a1c 100644 (file)
--- a/youtube_dl/extractor/gputechconf.py
+++ b/youtube_dl/extractor/gputechconf.py
@@ -31,5 +31,5 @@ class GPUTechConfIE(InfoExtractor):
             '_type': 'url_transparent',
             'id': video_id,
             'url': '%sxml/%s.xml' % (root_path, xml_file_id),
-            'ie': 'DigitalSpeaking',
+            'ie_key': 'DigitalSpeaking',
         }