From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Thu, 21 Apr 2016 15:58:36 +0000 (+0800)
Subject: [dispeak] Several fixes
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=748e7300991ba9ea5b9ede7134110be135743b66;p=youtube-dl

[dispeak] Several fixes
---

diff --git a/youtube_dl/extractor/dispeak.py b/youtube_dl/extractor/dispeak.py
index c74fa7e07..aaa2f8cd1 100644
--- 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 5d45faf85..373053a66 100644
--- 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 359b348e4..14daef7a8 100644
--- 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',
         }