Rename request.identity to request.authenticated_identity.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/pyramid/security.py b/src/pyramid/security.py
index 5d8e916d7..fd05746bd 100644
--- a/src/pyramid/security.py
+++ b/src/pyramid/security.py
@@ -279,7 +279,7 @@ class ACLAllowed(ACLPermitsResult, Allowed):
 
 class SecurityAPIMixin(object):
     @property
-    def identity(self):
+    def authenticated_identity(self):
         """
         Return an opaque object identifying the current user or ``None`` if no
         user is authenticated or there is no :term:`security policy` in effect.
diff --git a/tests/test_security.py b/tests/test_security.py
index 5a0307c66..2a8847f3b 100644
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@ -318,7 +318,7 @@ class TestViewExecutionPermitted(unittest.TestCase):
         self.assertTrue(result)
 
 
-class TestIdentity(unittest.TestCase):
+class TestAuthenticatedIdentity(unittest.TestCase):
     def setUp(self):
         testing.setUp()
 
@@ -327,12 +327,12 @@ class TestIdentity(unittest.TestCase):
 
     def test_identity_no_security_policy(self):
         request = _makeRequest()
-        self.assertEquals(request.identity, None)
+        self.assertEquals(request.authenticated_identity, None)
 
     def test_identity(self):
         request = _makeRequest()
         _registerSecurityPolicy(request.registry, 'yo')
-        self.assertEqual(request.identity, 'yo')
+        self.assertEqual(request.authenticated_identity, 'yo')
 
 
 class TestAuthenticatedUserId(unittest.TestCase):