Extract httputils.redirect

radicale/app/__init__.py

@@ -197,10 +197,8 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
             location = base_prefix + path
             logger.info("Redirecting to sanitized path: %r ==> %r",
                         base_prefix + unsafe_path, location)
-            return response(
-                client.MOVED_PERMANENTLY,
-                {"Location": location, "Content-Type": "text/plain"},
-                "Redirected to %s" % location)
+            return response(*httputils.redirect(
+                                location, client.MOVED_PERMANENTLY))
         logger.debug("Sanitized path: %r", path)
 
         # Get function corresponding to method

radicale/app/get.py

@@ -62,10 +62,7 @@ class ApplicationPartGet(ApplicationBase):
         """Manage GET request."""
         # Redirect to .web if the root URL is requested
         if not pathutils.strip_path(path):
-            location = ".web"
-            return (client.FOUND,
-                    {"Location": location, "Content-Type": "text/plain"},
-                    "Redirected to %s" % location)
+            return httputils.redirect(".web")
         # Dispatch .web URL to web module
         if path == "/.web" or path.startswith("/.web/"):
             return self._web.get(environ, base_prefix, path, user)

radicale/httputils.py

@@ -114,3 +114,9 @@ def read_request_body(configuration: "config.Configuration",
                              read_raw_request_body(configuration, environ))
     logger.debug("Request content:\n%s", content)
     return content
+
+
+def redirect(location: str, status: int = client.FOUND) -> types.WSGIResponse:
+    return (status,
+            {"Location": location, "Content-Type": "text/plain"},
+            "Redirected to %s" % location)

radicale/web/internal.py

@@ -75,10 +75,7 @@ class Web(web.BaseWeb):
                          path, e, exc_info=True)
             return httputils.NOT_FOUND
         if os.path.isdir(filesystem_path) and not path.endswith("/"):
-            location = posixpath.basename(path) + "/"
-            return (client.FOUND,
-                    {"Location": location, "Content-Type": "text/plain"},
-                    "Redirected to %s" % location)
+            return httputils.redirect(posixpath.basename(path) + "/")
         if os.path.isdir(filesystem_path):
             filesystem_path = os.path.join(filesystem_path, "index.html")
         if not os.path.isfile(filesystem_path):