projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'David-Development/rtl2.py'
[youtube-dl]
/
youtube_dl
/
extractor
/
grooveshark.py
diff --git
a/youtube_dl/extractor/grooveshark.py
b/youtube_dl/extractor/grooveshark.py
index 726adff773305844a5e8950b4467509646b79d1d..fff74a70a891fc163ff488408e4df348564b8a29 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):