[26.0] Delete dummy error controller, fix type error on invalid requests

doc/source/lib/galaxy.webapps.galaxy.controllers.rst

@@ -57,14 +57,6 @@ galaxy.webapps.galaxy.controllers.dataset module
    :undoc-members:
    :show-inheritance:
 
-galaxy.webapps.galaxy.controllers.error module
-----------------------------------------------
-
-.. automodule:: galaxy.webapps.galaxy.controllers.error
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 galaxy.webapps.galaxy.controllers.forms module
 ----------------------------------------------
 

lib/galaxy/web/framework/base.py

@@ -271,7 +271,7 @@ def handle_request(self, request_id, path_info, environ, start_response, body_re
         try:
             body = method(trans, **kwargs)
         except Exception as e:
-            body = self.handle_controller_exception(e, trans, method, **kwargs)
+            body = self.handle_controller_exception(e, trans, method, kwargs)
             if not body:
                 trans.response.headers.pop("content-length", None)
                 raise
@@ -307,7 +307,7 @@ def make_body_iterable(self, trans, body):
             # Worst case scenario
             return [smart_str(body)]
 
-    def handle_controller_exception(self, e, trans, method, **kwargs):
+    def handle_controller_exception(self, e, trans, method, kwargs):
         """
         Allow handling of exceptions raised in controller methods.
         """

lib/galaxy/webapps/base/webapp.py

@@ -200,7 +200,7 @@ def create_mako_template_lookup(self, galaxy_app, name):
                 directories=paths, module_directory=galaxy_app.config.template_cache_path, collection_size=500
             )
 
-    def handle_controller_exception(self, e, trans, method, **kwargs):
+    def handle_controller_exception(self, e, trans, method, kwargs):
         if not isinstance(e, HTTPException):
             # We're still logging too much here but at least it's not logging webob.exc.HTTPFound and friends
             log.debug(f"Encountered exception in controller method: {method}", exc_info=True)