summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-08-28 01:00:59 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-08-28 01:00:59 +0200
commitb759a0d4d2273fdde1f504cdc928ea340e12456e (patch)
treeac8fe7b037ecf2661a2edcc76ce8a7d3232275ed
parent22a6f15061127045f4d6ae1ff4efc922fa372cc2 (diff)
downloadyoutube-dl-b759a0d4d2273fdde1f504cdc928ea340e12456e.tar.gz
youtube-dl-b759a0d4d2273fdde1f504cdc928ea340e12456e.tar.xz
youtube-dl-b759a0d4d2273fdde1f504cdc928ea340e12456e.zip
fix up imports
-rw-r--r--youtube_dl/extractor/generic.py1
-rw-r--r--youtube_dl/extractor/musicvault.py2
-rw-r--r--youtube_dl/extractor/ustream.py1
3 files changed, 1 insertions, 3 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index acdf725cc..b4f748e87 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -12,6 +12,7 @@ from ..utils import (
     compat_urlparse,
     compat_xml_parse_error,
 
+    determine_ext,
     ExtractorError,
     float_or_none,
     HEADRequest,
diff --git a/youtube_dl/extractor/musicvault.py b/youtube_dl/extractor/musicvault.py
index 329bf61e0..ebb1eb8e9 100644
--- a/youtube_dl/extractor/musicvault.py
+++ b/youtube_dl/extractor/musicvault.py
@@ -1,11 +1,9 @@
 from __future__ import unicode_literals
 
-import json
 import re
 
 from .common import InfoExtractor
 from ..utils import (
-    strip_jsonp,
     parse_duration,
     unified_strdate,
 )
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py
index 816b101eb..994b60a76 100644
--- a/youtube_dl/extractor/ustream.py
+++ b/youtube_dl/extractor/ustream.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import json
 import re
 
 from .common import InfoExtractor