import urlparse
from future import standard_library
standard_library.install_aliases()
from builtins import zip
import urllib.parse
from django import template
@@ -13,8 +16,8 @@ def fill_url(given_url, base_url):
Typical usage is "/URL/path"|fill_url:"https://hostname/"
to generate "https://hostname/URL/path".
"""
given_parts = urlparse.urlsplit(given_url)
base_parts = urlparse.urlsplit(base_url)
return urlparse.urlunsplit(
given_parts = urllib.parse.urlsplit(given_url)
base_parts = urllib.parse.urlsplit(base_url)
return urllib.parse.urlunsplit(
given_part or base_part for given_part, base_part in zip(given_parts, base_parts)
)