Merge tag 'upstream/2014.12.01'

[youtubedl] / youtube_dl / extractor / gamekings.py

diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py
index c91669b0ebaeac6085ba010c242dc571b28e57e1..cf8e90d7dbe9483efffe7894bedbe437746c5da1 100644 (file)
--- a/youtube_dl/extractor/gamekings.py
+++ b/youtube_dl/extractor/gamekings.py
@@ -1,18 +1,21 @@
+from __future__ import unicode_literals
+

 import re
 
 from .common import InfoExtractor
 
 
 class GamekingsIE(InfoExtractor):
 import re
 
 from .common import InfoExtractor
 
 
 class GamekingsIE(InfoExtractor):

-    _VALID_URL = r'http?://www\.gamekings\.tv/videos/(?P<name>[0-9a-z\-]+)'
+    _VALID_URL = r'http://www\.gamekings\.tv/videos/(?P<name>[0-9a-z\-]+)'

     _TEST = {
     _TEST = {

-        u"url": u"http://www.gamekings.tv/videos/phoenix-wright-ace-attorney-dual-destinies-review/",
-        u'file': u'20130811.mp4',
+        'url': 'http://www.gamekings.tv/videos/phoenix-wright-ace-attorney-dual-destinies-review/',

         # MD5 is flaky, seems to change regularly
         # MD5 is flaky, seems to change regularly

-        #u'md5': u'2f32b1f7b80fdc5cb616efb4f387f8a3',
-        u'info_dict': {
-            u"title": u"Phoenix Wright: Ace Attorney \u2013 Dual Destinies Review",
-            u"description": u"Melle en Steven hebben voor de review een week in de rechtbank doorbracht met Phoenix Wright: Ace Attorney - Dual Destinies.",
+        # 'md5': '2f32b1f7b80fdc5cb616efb4f387f8a3',
+        'info_dict': {
+            'id': '20130811',
+            'ext': 'mp4',
+            'title': 'Phoenix Wright: Ace Attorney \u2013 Dual Destinies Review',
+            'description': 'md5:36fd701e57e8c15ac8682a2374c99731',

         }
     }
 
         }
     }