summaryrefslogtreecommitdiff
path: root/cherrypy/lib/cptools.py
diff options
context:
space:
mode:
authornick125 <none@none>2008-07-09 05:55:06 +0000
committernick125 <none@none>2008-07-09 05:55:06 +0000
commit3709c4aa33736eebca888ed059555eb4a0ce16f2 (patch)
treeff4f4025d7138dd3252e65b404795c04d0379c56 /cherrypy/lib/cptools.py
parent6eba540b6c1a3e97967bd48489452fca2cebea92 (diff)
downloadcherrypy-git-3709c4aa33736eebca888ed059555eb4a0ce16f2.tar.gz
* Test case and fix for Ticket #780
Diffstat (limited to 'cherrypy/lib/cptools.py')
-rw-r--r--cherrypy/lib/cptools.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cherrypy/lib/cptools.py b/cherrypy/lib/cptools.py
index 966c3289..eefd1ae7 100644
--- a/cherrypy/lib/cptools.py
+++ b/cherrypy/lib/cptools.py
@@ -212,7 +212,7 @@ class SessionAuth(object):
def on_check(self, username):
pass
- def login_screen(self, from_page='..', username='', error_msg=''):
+ def login_screen(self, from_page='..', username='', error_msg='', **kwargs):
return """<html><body>
Message: %(error_msg)s
<form method="post" action="do_login">
@@ -224,7 +224,7 @@ Message: %(error_msg)s
</body></html>""" % {'from_page': from_page, 'username': username,
'error_msg': error_msg}
- def do_login(self, username, password, from_page='..'):
+ def do_login(self, username, password, from_page='..', **kwargs):
"""Login. May raise redirect, or return True if request handled."""
error_msg = self.check_username_and_password(username, password)
if error_msg:
@@ -239,7 +239,7 @@ Message: %(error_msg)s
self.on_login(username)
raise cherrypy.HTTPRedirect(from_page or "/")
- def do_logout(self, from_page='..'):
+ def do_logout(self, from_page='..', **kwargs):
"""Logout. May raise redirect, or return True if request handled."""
sess = cherrypy.session
username = sess.get(self.session_key)