[Checkins] SVN: zope.app.security/trunk/ The IPrincipal -> ILoggingInfo adapter was moved to zope.publisher. Provide BBB import.

[Dan Korostelev]

Log message for revision 97916:
  The IPrincipal -> ILoggingInfo adapter was moved to zope.publisher. Provide BBB import.
  

Changed:
  U   zope.app.security/trunk/CHANGES.txt
  U   zope.app.security/trunk/buildout.cfg
  U   zope.app.security/trunk/src/zope/app/security/configure.zcml
  U   zope.app.security/trunk/src/zope/app/security/principallogging.py
  U   zope.app.security/trunk/src/zope/app/security/tests/test_principallogging.py

-=-
Modified: zope.app.security/trunk/CHANGES.txt
===================================================================
--- zope.app.security/trunk/CHANGES.txt	2009-03-11 21:07:13 UTC (rev 97915)
+++ zope.app.security/trunk/CHANGES.txt	2009-03-11 21:10:57 UTC (rev 97916)
@@ -5,6 +5,10 @@
 3.7.0 (unreleased)
 ------------------
 
+- The IPrincipal -> zope.publisher.interfaces.logginginfo.ILoggingInfo
+  adapter was moved to ``zope.publisher``. Backward-compatibility import
+  is provided.
+
 - The PermissionsVocabulary and PermissionIdsVocabulary has been moved
   to the ``zope.security`` package. Backward-compatibility imports are
   provided.

Modified: zope.app.security/trunk/buildout.cfg
===================================================================
--- zope.app.security/trunk/buildout.cfg	2009-03-11 21:07:13 UTC (rev 97915)
+++ zope.app.security/trunk/buildout.cfg	2009-03-11 21:10:57 UTC (rev 97916)
@@ -1,5 +1,5 @@
 [buildout]
-develop = . ../zope.localpermission ../zope.security
+develop = . ../zope.localpermission ../zope.security ../zope.publisher
 parts = test  coverage-test coverage-report
 
 [test]

Modified: zope.app.security/trunk/src/zope/app/security/configure.zcml
===================================================================
--- zope.app.security/trunk/src/zope/app/security/configure.zcml	2009-03-11 21:07:13 UTC (rev 97915)
+++ zope.app.security/trunk/src/zope/app/security/configure.zcml	2009-03-11 21:10:57 UTC (rev 97916)
@@ -91,12 +91,6 @@
       for="zope.publisher.interfaces.ftp.IFTPCredentials"
       />
 
-  <adapter
-      factory=".principallogging.PrincipalLogging"
-      provides="zope.publisher.interfaces.logginginfo.ILoggingInfo"
-      for=".interfaces.IPrincipal"
-      />
-
   <utility
       component=".principalregistry.fallback_unauthenticated_principal"
       provides=".interfaces.IFallbackUnauthenticatedPrincipal"

Modified: zope.app.security/trunk/src/zope/app/security/principallogging.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/principallogging.py	2009-03-11 21:07:13 UTC (rev 97915)
+++ zope.app.security/trunk/src/zope/app/security/principallogging.py	2009-03-11 21:10:57 UTC (rev 97916)
@@ -11,19 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""An adapter from IPrincipal to the ILoggingInfo.
+"""Backward-compatibility import for PrincipalLogging
 
 $Id$
 """
-from zope.interface import implements
-from zope.publisher.interfaces.logginginfo import ILoggingInfo
 
-class PrincipalLogging(object):
-
-    implements(ILoggingInfo)
-
-    def __init__(self, principal):
-        self.principal = principal
-
-    def getLogMessage(self):
-        return str(self.principal.id)
+# BBB: this was moved to zope.publisher.
+from zope.publisher.principallogging import PrincipalLogging

Modified: zope.app.security/trunk/src/zope/app/security/tests/test_principallogging.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/tests/test_principallogging.py	2009-03-11 21:07:13 UTC (rev 97915)
+++ zope.app.security/trunk/src/zope/app/security/tests/test_principallogging.py	2009-03-11 21:10:57 UTC (rev 97916)
@@ -16,34 +16,24 @@
 $Id$
 """
 import unittest
-from zope.interface.verify import verifyObject
+from zope.testing.doctestunit import DocTestSuite
 
-class PrincipalStub(object):
+def test_bbb_imports():
+    """
+    Let's check that permission vocabularies that were moved to
+    zope.security are still importable from original place.
+    
+      >>> import zope.publisher.principallogging as new
+      >>> import zope.app.security.principallogging as old
+      >>> old.PrincipalLogging is new.PrincipalLogging
+      True
+    
+    """
 
-    id = 42
-
-
-class TestPrincipalLogging(unittest.TestCase):
-
-    def test_interface(self):
-        from zope.app.security.principallogging import PrincipalLogging
-        from zope.publisher.interfaces.logginginfo import ILoggingInfo
-        principal = PrincipalStub()
-        pl = PrincipalLogging(principal)
-        verifyObject(ILoggingInfo, pl)
-
-    def test_getLogMessage(self):
-        from zope.app.security.principallogging import PrincipalLogging
-        principal = PrincipalStub()
-        pl = PrincipalLogging(principal)
-        self.assertEquals(pl.getLogMessage(), "42")
-
-
 def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestPrincipalLogging))
-    return suite
+    return unittest.TestSuite((
+        DocTestSuite(),
+        ))
 
-
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(defaultTest='test_suite')