Merge tag 'upstream/2015.02.28'

[youtubedl] / youtube_dl / extractor / grooveshark.py

diff --git a/youtube_dl/extractor/grooveshark.py b/youtube_dl/extractor/grooveshark.py
index 726adff773305844a5e8950b4467509646b79d1d..848d17beb4d3559cb818f14795655b12912e0f11 100644 (file)
--- a/youtube_dl/extractor/grooveshark.py
+++ b/youtube_dl/extractor/grooveshark.py
@@ -8,12 +8,13 @@ import re
 
 
 from .common import InfoExtractor
 
 
 from .common import InfoExtractor

-from ..utils import ExtractorError, compat_urllib_request, compat_html_parser
-
-from ..utils import (
+from ..compat import (
+    compat_html_parser,

     compat_urllib_parse,
     compat_urllib_parse,

+    compat_urllib_request,

     compat_urlparse,
 )
     compat_urlparse,
 )

+from ..utils import ExtractorError

 
 
 class GroovesharkHtmlParser(compat_html_parser.HTMLParser):
 
 
 class GroovesharkHtmlParser(compat_html_parser.HTMLParser):


@@ -82,7 +83,7 @@ class GroovesharkIE(InfoExtractor):
         return compat_urlparse.urlunparse((uri.scheme, uri.netloc, obj['attrs']['data'], None, None, None))
 
     def _transform_bootstrap(self, js):
         return compat_urlparse.urlunparse((uri.scheme, uri.netloc, obj['attrs']['data'], None, None, None))
 
     def _transform_bootstrap(self, js):

-        return re.split('(?m)^\s*try\s*{', js)[0] \
+        return re.split('(?m)^\s*try\s*\{', js)[0] \

                  .split(' = ', 1)[1].strip().rstrip(';')
 
     def _transform_meta(self, js):
                  .split(' = ', 1)[1].strip().rstrip(';')
 
     def _transform_meta(self, js):