diff options
author | Sergey M․ <dstftw@gmail.com> | 2015-03-17 21:34:22 +0600 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2015-03-17 21:34:22 +0600 |
commit | 92a4793b3cac36677bed5423b12b3d97d15c6036 (patch) | |
tree | e6eb30ae9557d777f7394c3ca2499b257fa6d87f /youtube_dl/utils.py | |
parent | dc03a42537cba83597ca8acb2bbe03f686f2136c (diff) |
[utils] Place sanitize url function near other sanitizing functions
Diffstat (limited to 'youtube_dl/utils.py')
-rw-r--r-- | youtube_dl/utils.py | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index e82e3998a..472d4df41 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -326,6 +326,13 @@ def sanitize_path(s): return os.path.join(*sanitized_path) +def sanitize_url_path_consecutive_slashes(url): + """Collapses consecutive slashes in URLs' path""" + parsed_url = list(compat_urlparse.urlparse(url)) + parsed_url[2] = re.sub(r'/{2,}', '/', parsed_url[2]) + return compat_urlparse.urlunparse(parsed_url) + + def orderedSet(iterable): """ Remove all duplicates from the input iterable """ res = [] @@ -1804,18 +1811,3 @@ class PerRequestProxyHandler(compat_urllib_request.ProxyHandler): return None # No Proxy return compat_urllib_request.ProxyHandler.proxy_open( self, req, proxy, type) - - -def url_sanitize_consecutive_slashes(url): - """Sanitize URLs with consecutive slashes - - For example, transform both - http://hostname/foo//bar/filename.html - and - http://hostname//foo/bar/filename.html - into - http://hostname/foo/bar/filename.html - """ - parsed_url = list(compat_urlparse.urlparse(url)) - parsed_url[2] = re.sub(r'/{2,}', '/', parsed_url[2]) - return compat_urlparse.urlunparse(parsed_url) |