diff options
| author | Chris McDonough <chrism@plope.com> | 2011-12-15 05:11:29 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-12-15 05:11:29 -0500 |
| commit | 01c00413e01e6e43f8355fc635d0fad5ec87651f (patch) | |
| tree | a07965fc1dff4a2dfe0eb1c11c60d12d9e899d11 | |
| parent | bc08bb6989f674e9c1c2ecf383bf5d71fc0d5f98 (diff) | |
| parent | 8e615c4f433c4df9b694c6452f793ed4763434ff (diff) | |
| download | pyramid-01c00413e01e6e43f8355fc635d0fad5ec87651f.tar.gz pyramid-01c00413e01e6e43f8355fc635d0fad5ec87651f.tar.bz2 pyramid-01c00413e01e6e43f8355fc635d0fad5ec87651f.zip | |
Merge branch 'master' into 1.3-branch
| -rw-r--r-- | pyramid/authentication.py | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_authentication.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/authentication.py b/pyramid/authentication.py index 13ec4284a..83bdb13d1 100644 --- a/pyramid/authentication.py +++ b/pyramid/authentication.py @@ -82,7 +82,7 @@ class CallbackAuthenticationPolicy(object): userid = self.unauthenticated_userid(request) if userid is None: debug and self._log( - 'authenticated_userid returned %r; returning %r' % ( + 'unauthenticated_userid returned %r; returning %r' % ( userid, effective_principals), 'effective_principals', request diff --git a/pyramid/tests/test_authentication.py b/pyramid/tests/test_authentication.py index c7ae407ce..02bfa1fed 100644 --- a/pyramid/tests/test_authentication.py +++ b/pyramid/tests/test_authentication.py @@ -83,7 +83,7 @@ class TestCallbackAuthenticationPolicyDebugging(unittest.TestCase): self.assertEqual( self.messages[0], "pyramid.tests.test_authentication.MyAuthenticationPolicy." - "effective_principals: authenticated_userid returned None; " + "effective_principals: unauthenticated_userid returned None; " "returning ['system.Everyone']") def test_effective_principals_no_callback(self): |