Replaced the set() method with the kwargs-based query() method in UrlBuilder in the Mia core application.

mia_core/status.py

@@ -38,8 +38,8 @@ def success_redirect(request, url, success):
     Returns:
         HttpResponseRedirect: The redirect response.
     """
-    id = _store(request, {"success": success})
-    return HttpResponseRedirect(str(UrlBuilder(url).set("s", id)))
+    status_id = _store(request, {"success": success})
+    return HttpResponseRedirect(str(UrlBuilder(url).query(s=status_id)))
 
 
 def error_redirect(request, url, form):
@@ -57,8 +57,8 @@ def error_redirect(request, url, form):
     Returns:
         HttpResponseRedirect: The redirect response.
     """
-    id = _store(request, {"form": form})
-    return HttpResponseRedirect(str(UrlBuilder(url).set("s", id)))
+    status_id = _store(request, {"form": form})
+    return HttpResponseRedirect(str(UrlBuilder(url).query(s=status_id)))
 
 
 def retrieve_status(request):

mia_core/templatetags/mia_core.py

@@ -95,8 +95,7 @@ def url_with_return(context, view_name, *args):
         str: The URL.
     """
     url = reverse(view_name, args=args)
-    return_to = context.request.get_full_path()
-    return str(UrlBuilder(url).set("r", return_to))
+    return str(UrlBuilder(url).query(r=context.request.get_full_path()))
 
 
 @register.simple_tag(takes_context=True)
@@ -112,7 +111,7 @@ def url_keep_return(context, view_name, *args):
         str: The URL.
     """
     url = reverse(view_name, args=args)
-    return str(UrlBuilder(url).set("r", context.request.GET.get("r")))
+    return str(UrlBuilder(url).query(r=context.request.GET.get("r")))
 
 
 @register.simple_tag(takes_context=True)

mia_core/utils.py

@@ -197,19 +197,21 @@ class UrlBuilder:
         self.params = [x for x in self.params if x.name != name]
         return self
 
-    def set(self, name, value):
-        """Sets a query parameter.  The current parameters with the
-        same name will be replaced.
-
-        Args:
-            name (str): The parameter name
-            value (str): The parameter value
-
-        Returns:
-            UrlBuilder: The URL builder itself, with the parameter
-                modified.
+    def query(self, **kwargs):
+        """A keyword-styled query parameter setter.  The existing values are
+        always replaced.  Multiple-values are added when the value is a list or
+        tuple.  The existing values are dropped when the value is None.
         """
-        return self.remove(name).add(name, value)
+        for key in kwargs:
+            self.remove(key)
+            if isinstance(kwargs[key], list) or isinstance(kwargs[key], tuple):
+                for value in kwargs[key]:
+                    self.add(key, value)
+            elif kwargs[key] is None:
+                pass
+            else:
+                self.add(key, kwargs[key])
+        return self
 
     def clone(self):
         """Returns a copy of this URL builder.