summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/index.rst5
-rw-r--r--pyramid/authentication.py2
-rw-r--r--pyramid/tests/test_authentication.py2
3 files changed, 4 insertions, 5 deletions
diff --git a/docs/index.rst b/docs/index.rst
index ca5f4aa30..21e587992 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,10 +19,9 @@ When saved to ``helloworld.py``, the above application can be run via:
$ easy_install pyramid
$ python helloworld.py
- serving on 0.0.0.0:8080 view at http://127.0.0.1:8080
-And when you visit ``http://localhost:8080/hello/world`` in a browser, you
-will see the text ``Hello, world!``.
+When you visit ``http://localhost:8080/hello/world`` in a browser, you will
+see the text ``Hello, world!``.
See :ref:`firstapp_chapter` for a full explanation of how this application
works. Read the :ref:`html_narrative_documentation` to understand how
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):