aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/utils.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2012-11-28 04:51:27 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2012-11-28 04:51:27 +0100
commit799c0763845dfb82d53ecae0080b276f447144de (patch)
tree4167bb063d4dae002bf934bb31dcb1f9ec1ee3da /youtube_dl/utils.py
parentf1cb5bcad2bf2983b584730164238adcd8fa7e94 (diff)
downloadyoutube-dl-799c0763845dfb82d53ecae0080b276f447144de.tar.xz
collegehumor: able to download a single f4f file (not yet playable)
Diffstat (limited to 'youtube_dl/utils.py')
-rw-r--r--youtube_dl/utils.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 836138277..4600dc967 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -27,6 +27,11 @@ except ImportError: # Python 2
import urllib as compat_urllib_parse
try:
+ from urllib.parse import urlparse as compat_urllib_parse_urlparse
+except ImportError: # Python 2
+ from urlparse import urlparse as compat_urllib_parse_urlparse
+
+try:
import http.cookiejar as compat_cookiejar
except ImportError: # Python 2
import cookielib as compat_cookiejar