[myspace] pep8 and modernization
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Nov 2014 21:12:18 +0000 (22:12 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Nov 2014 21:12:18 +0000 (22:12 +0100)
youtube_dl/extractor/myspace.py

index 553ded56d5198ccef32879dd33a84b8fc2c13f15..c3c1a27c3418c2f45f908cd9f6340f61edc8dd61 100644 (file)
@@ -4,7 +4,7 @@ import re
 import json
 
 from .common import InfoExtractor
-from ..utils import (
+from ..compat import (
     compat_str,
 )
 
@@ -52,8 +52,8 @@ class MySpaceIE(InfoExtractor):
         if mobj.group('mediatype').startswith('music/song'):
             # songs don't store any useful info in the 'context' variable
             def search_data(name):
-                return self._search_regex(r'data-%s="(.*?)"' % name, webpage,
-                                          name)
+                return self._search_regex(
+                    r'data-%s="(.*?)"' % name, webpage, name)
             streamUrl = search_data('stream-url')
             info = {
                 'id': video_id,
@@ -62,8 +62,8 @@ class MySpaceIE(InfoExtractor):
                 'thumbnail': self._og_search_thumbnail(webpage),
             }
         else:
-            context = json.loads(self._search_regex(r'context = ({.*?});', webpage,
-                                                    u'context'))
+            context = json.loads(self._search_regex(
+                r'context = ({.*?});', webpage, 'context'))
             video = context['video']
             streamUrl = video['streamUrl']
             info = {