aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-03-17 23:13:43 +0600
committerSergey M․ <dstftw@gmail.com>2015-03-17 23:13:43 +0600
commitb1337948ebeeacfcf104d513fac5913d3a5818a7 (patch)
treeee95f8413ec82f188d8f640acbda91cd2f0a1de6
parent98f02fdde25bf00fbccfb211abb574f80819a177 (diff)
downloadyoutube-dl-b1337948ebeeacfcf104d513fac5913d3a5818a7.tar.xz
[grooveshark] Fix extraction
-rw-r--r--youtube_dl/extractor/grooveshark.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/grooveshark.py b/youtube_dl/extractor/grooveshark.py
index 848d17beb..36ad4915c 100644
--- a/youtube_dl/extractor/grooveshark.py
+++ b/youtube_dl/extractor/grooveshark.py
@@ -140,9 +140,9 @@ class GroovesharkIE(InfoExtractor):
if webpage is not None:
o = GroovesharkHtmlParser.extract_object_tags(webpage)
- return (webpage, [x for x in o if x['attrs']['id'] == 'jsPlayerEmbed'])
+ return webpage, [x for x in o if x['attrs']['id'] == 'jsPlayerEmbed']
- return (webpage, None)
+ return webpage, None
def _real_initialize(self):
self.ts = int(time.time() * 1000) # timestamp in millis
@@ -154,7 +154,7 @@ class GroovesharkIE(InfoExtractor):
swf_referer = None
if self.do_playerpage_request:
(_, player_objs) = self._get_playerpage(url)
- if player_objs is not None:
+ if player_objs:
swf_referer = self._build_swf_referer(url, player_objs[0])
self.to_screen('SWF Referer: %s' % swf_referer)