Imported Upstream version 2014.07.15

[youtubedl] / youtube_dl / extractor / mpora.py

diff --git a/youtube_dl/extractor/mpora.py b/youtube_dl/extractor/mpora.py
index 6a8e2cc442c25327d9d91acebb47d4e109750731..387935d4db784641377b72f5be9ec5e7649f5908 100644 (file)
--- a/youtube_dl/extractor/mpora.py
+++ b/youtube_dl/extractor/mpora.py
@@ -4,9 +4,7 @@ import json
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..utils import (
-    int_or_none,
-)
+from ..utils import int_or_none

 
 
 class MporaIE(InfoExtractor):
 
 
 class MporaIE(InfoExtractor):


@@ -20,7 +18,7 @@ class MporaIE(InfoExtractor):
         'info_dict': {
             'title': 'Katy Curd -  Winter in the Forest',
             'duration': 416,
         'info_dict': {
             'title': 'Katy Curd -  Winter in the Forest',
             'duration': 416,

-            'uploader': 'petenewman',
+            'uploader': 'Peter Newman Media',

         },
     }
 
         },
     }
 


@@ -30,7 +28,7 @@ class MporaIE(InfoExtractor):
 
         webpage = self._download_webpage(url, video_id)
         data_json = self._search_regex(
 
         webpage = self._download_webpage(url, video_id)
         data_json = self._search_regex(

-            r"new FM\.Player\('[^']+',\s*(\{.*?)\);\n", webpage, 'json')
+            r"new FM\.Player\('[^']+',\s*(\{.*?)\).player;", webpage, 'json')

 
         data = json.loads(data_json)
 
 
         data = json.loads(data_json)