This updates the paste.auth.* modules to include

environ in the authentication callback functions.

- auth.basic was modified to have a callback of
  authfunc(environ, username, password)

- auth.digest was modified in a similar manner,
  authfunc(environ, realm, password)

- auth.digest's digest_password also had it's
  arguments reversed to be consistent with the
  corresponding authfunc(); if you're going to
  break -- let's fix two things at once!

- auth.form has a change similar to auth.basic

These changes were suggested via Matthew Scott
on the paste mailing list; only that I put the
environ first to be consistent with other
WSGI functions.

1 files changed, 3 insertions, 3 deletions

diff --git a/paste/auth/multi.py b/paste/auth/multi.py
index 47becae..12c9f26 100644
--- a/paste/auth/multi.py
+++ b/paste/auth/multi.py
@@ -18,12 +18,12 @@ stack; by default it uses form-based authentication unless
 >>> from paste.httpserver import serve
 >>>
 >>> multi = multi.MultiHandler(dump_environ)
->>> def authfunc(realm, user):
-...     return digest.digest_password(user, realm, user)
+>>> def authfunc(environ, realm, user):
+...     return digest.digest_password(realm, user, user)
 >>> multi.add_method('digest', digest.middleware, "Test Realm", authfunc)
 >>> multi.set_query_argument('digest')
 >>>
->>> def authfunc(username, password):
+>>> def authfunc(environ, username, password):
 ...     return username == password
 >>> multi.add_method('form', form.middleware, authfunc)
 >>> multi.set_default('form')