# HG changeset patch # User k0s # Date 1261886959 18000 # Node ID 40fa556252a7923bbaf75b7c0bb7386062b0798a # Parent 2693b81f59603469539e255753cf1434421641c0 fix playing nice with paste auth diff -r 2693b81f5960 -r 40fa556252a7 bitsyauth/__init__.py --- a/bitsyauth/__init__.py Sat Dec 26 22:56:56 2009 -0500 +++ b/bitsyauth/__init__.py Sat Dec 26 23:09:19 2009 -0500 @@ -121,7 +121,7 @@ multi_auth.set_query_argument('digest', key='auth') # form authentication - template = self.login(wrap=True) + template = self.login(wrap=True, action='%s') multi_auth.add_method('form', form.middleware, self.authfunc, template=template) multi_auth.set_default('form') @@ -186,9 +186,7 @@ ### login def login_form(self, referer=None, action=None): - if action is None: - action = self.urls['login'] - form = Form(action='', submit='Login') + form = Form(action=action or '', submit='Login') form.add_element('textfield', 'Name', input_name='username') form.add_element('password', 'Password', input_name='password') if referer: @@ -200,7 +198,6 @@ referer = None if hasattr(self, 'request'): referer = self.request.referer - form = self.login_form(action=action, referer=referer) join = self.urls.get('join') retval = form(errors)