Chris McDonough
2011-12-15 01c00413e01e6e43f8355fc635d0fad5ec87651f
Merge branch 'master' into 1.3-branch
2 files modified
4 ■■■■ changed files
pyramid/authentication.py 2 ●●● patch | view | raw | blame | history
pyramid/tests/test_authentication.py 2 ●●● patch | view | raw | blame | history
pyramid/authentication.py
@@ -82,7 +82,7 @@
        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
pyramid/tests/test_authentication.py
@@ -83,7 +83,7 @@
        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):