Merge remote-tracking branch 'hojel/slutload'

[youtube-dl] / youtube_dl / extractor / mpora.py

diff --git a/youtube_dl/extractor/mpora.py b/youtube_dl/extractor/mpora.py
index b4cdd2a1e283cd2c5616c58bb9d4100fe0304c3f..39d6feb98d171f16b2ae5d69d71cde67b3a21372 100644 (file)
--- a/youtube_dl/extractor/mpora.py
+++ b/youtube_dl/extractor/mpora.py
@@ -4,14 +4,12 @@ import json
 import re
 
 from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-)
+from ..utils import int_or_none
 
 
 class MporaIE(InfoExtractor):
     _VALID_URL = r'^https?://(www\.)?mpora\.(?:com|de)/videos/(?P<id>[^?#/]+)'
-    _IE_NAME = 'MPORA'
+    IE_NAME = 'MPORA'
 
     _TEST = {
         'url': 'http://mpora.de/videos/AAdo8okx4wiz/embed?locale=de',
@@ -20,7 +18,7 @@ class MporaIE(InfoExtractor):
         'info_dict': {
             'title': 'Katy Curd -  Winter in the Forest',
             'duration': 416,
-            'uploader': 'petenewman',
+            'uploader': 'Peter Newman Media',
         },
     }
 
@@ -34,7 +32,7 @@ class MporaIE(InfoExtractor):
 
         data = json.loads(data_json)
 
-        uploader = data['info_overlay']['name']
+        uploader = data['info_overlay'].get('username')
         duration = data['video']['duration'] // 1000
         thumbnail = data['video']['encodings']['sd']['poster']
         title = data['info_overlay']['title']