diff --git a/www/conservancy/apps/news/templatetags/fill_url.py b/www/conservancy/apps/news/templatetags/fill_url.py
index 5d9d9a02c54ec65468284b231f1347cc97cb0b9c..e36fbee54f3726f30907195a442ab525c3ec90d1 100644
--- a/www/conservancy/apps/news/templatetags/fill_url.py
+++ b/www/conservancy/apps/news/templatetags/fill_url.py
@@ -1,4 +1,7 @@
-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)
     )