Skip to content

Commit 18f1344

Browse files
committed
Ignore unexpected keyword arguments
Signed-off-by: Anders Kaseorg <[email protected]>
1 parent 3a1c0bc commit 18f1344

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

scriptspony/controllers/controller.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ from scriptspony.lib.base import BaseController
1313
class SampleController(BaseController):
1414

1515
@expose('scriptspony.templates.index')
16-
def index(self):
16+
def index(self, **kwargs):
1717
return dict(page='index')

scriptspony/controllers/root.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class RootController(BaseController):
4848
error = ErrorController()
4949

5050
@expose("scriptspony.templates.index")
51-
def index(self, locker=None, sudo=False):
51+
def index(self, locker=None, sudo=False, **kwargs):
5252
"""Handle the front-page."""
5353
if locker is not None and request.response_ext:
5454
locker += request.response_ext
@@ -101,7 +101,7 @@ def index(self, locker=None, sudo=False):
101101
return dict(hosts=hosts, locker=locker, user_info=user_info, https=https)
102102

103103
@expose("scriptspony.templates.edit")
104-
def edit(self, locker, hostname, path=None, token=None, alias=""):
104+
def edit(self, locker, hostname, path=None, token=None, alias="", **kwargs):
105105
if request.response_ext:
106106
hostname += request.response_ext
107107
if path is not None:
@@ -138,7 +138,7 @@ def edit(self, locker, hostname, path=None, token=None, alias=""):
138138
)
139139

140140
@expose("scriptspony.templates.delete")
141-
def delete(self, locker, hostname, confirm=False, token=None):
141+
def delete(self, locker, hostname, confirm=False, token=None, **kwargs):
142142
if request.response_ext:
143143
hostname += request.response_ext
144144
if confirm:
@@ -172,6 +172,7 @@ def new(
172172
confirmed=False,
173173
personal_ok=False,
174174
requestor=None,
175+
**kwargs
175176
):
176177
personal = locker == auth.current_user()
177178
if confirmed:
@@ -234,12 +235,12 @@ def queue(self, **kw):
234235

235236
@expose("scriptspony.templates.ticket")
236237
@scripts_team_only
237-
def ticket(self, id):
238+
def ticket(self, id, **kwargs):
238239
return dict(tickets=[queue.Ticket.get(int(id))])
239240

240241
@expose("scriptspony.templates.message")
241242
@scripts_team_only
242-
def approve(self, id, subject=None, body=None, token=None, silent=False):
243+
def approve(self, id, subject=None, body=None, token=None, silent=False, **kwargs):
243244
t = queue.Ticket.get(int(id))
244245
if t.state != "open":
245246
flash("This ticket's not open!")
@@ -314,7 +315,7 @@ def approve(self, id, subject=None, body=None, token=None, silent=False):
314315

315316
@expose("scriptspony.templates.message")
316317
@scripts_team_only
317-
def reject(self, id, subject=None, body=None, token=None, silent=False):
318+
def reject(self, id, subject=None, body=None, token=None, silent=False, **kwargs):
318319
t = queue.Ticket.get(int(id))
319320
if t.state != "open":
320321
flash("This ticket's not open!")

0 commit comments

Comments
 (0)