[myspace] pep8 and modernization

This commit is contained in:
Philipp Hagemeister 2014-11-23 22:12:18 +01:00
parent 27f8b0994e
commit b66e699877

View file

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