[Checkins] SVN: zope.app.security/trunk/ Remove deprecated stuff, also removing dependency on zope.deferredimport and zope.deprecation.

[Dan Korostelev]

Log message for revision 97491:
  Remove deprecated stuff, also removing dependency on zope.deferredimport and zope.deprecation.

Changed:
  U   zope.app.security/trunk/CHANGES.txt
  U   zope.app.security/trunk/setup.py
  D   zope.app.security/trunk/src/zope/app/security/adapter.py
  D   zope.app.security/trunk/src/zope/app/security/fields.py
  U   zope.app.security/trunk/src/zope/app/security/interfaces.py
  U   zope.app.security/trunk/src/zope/app/security/metadirectives.py
  U   zope.app.security/trunk/src/zope/app/security/permission.py

-=-
Modified: zope.app.security/trunk/CHANGES.txt
===================================================================
--- zope.app.security/trunk/CHANGES.txt	2009-03-04 20:39:19 UTC (rev 97490)
+++ zope.app.security/trunk/CHANGES.txt	2009-03-04 20:42:31 UTC (rev 97491)
@@ -5,6 +5,9 @@
 3.6.1 (unreleased)
 ------------------
 
+- Remove deprecated code, thus removing explicit dependency on
+  zope.deprecation and zope.deferredimport.
+
 - Use template for AuthUtilitySearchView instead of ugly HTML
   constructing in the python code.
 

Modified: zope.app.security/trunk/setup.py
===================================================================
--- zope.app.security/trunk/setup.py	2009-03-04 20:39:19 UTC (rev 97490)
+++ zope.app.security/trunk/setup.py	2009-03-04 20:42:31 UTC (rev 97491)
@@ -73,8 +73,6 @@
                         'zope.component',
                         'zope.configuration',
                         'zope.container',
-                        'zope.deferredimport',
-                        'zope.deprecation',
                         'zope.i18n',
                         'zope.i18nmessageid',
                         'zope.interface',

Deleted: zope.app.security/trunk/src/zope/app/security/adapter.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/adapter.py	2009-03-04 20:39:19 UTC (rev 97490)
+++ zope.app.security/trunk/src/zope/app/security/adapter.py	2009-03-04 20:42:31 UTC (rev 97491)
@@ -1,7 +0,0 @@
-# This module has moved to zope.security.adapter
-# and will go away in Zope 3.5
-import zope.deprecation
-zope.deprecation.moved(
-    'zope.security.adapter',
-    "Zope 3.5",
-    )

Deleted: zope.app.security/trunk/src/zope/app/security/fields.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/fields.py	2009-03-04 20:39:19 UTC (rev 97490)
+++ zope.app.security/trunk/src/zope/app/security/fields.py	2009-03-04 20:42:31 UTC (rev 97491)
@@ -1,7 +0,0 @@
-# This module has moved to zope.security.zcml
-# and will go away in Zope 3.5
-import zope.deprecation
-zope.deprecation.moved(
-    'zope.security.zcml',
-    "Zope 3.5",
-    )

Modified: zope.app.security/trunk/src/zope/app/security/interfaces.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/interfaces.py	2009-03-04 20:39:19 UTC (rev 97490)
+++ zope.app.security/trunk/src/zope/app/security/interfaces.py	2009-03-04 20:42:31 UTC (rev 97491)
@@ -138,14 +138,7 @@
         object hierarchy.
         """
 
-class IAuthenticationUtility(IAuthentication):
-    """This interface is deprecated
-    """
 
-    def getPrincipals(name):
-        """This interface is deprecated
-        """
-
 class ILoginPassword(Interface):
     """A password based login.
 

Modified: zope.app.security/trunk/src/zope/app/security/metadirectives.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/metadirectives.py	2009-03-04 20:39:19 UTC (rev 97490)
+++ zope.app.security/trunk/src/zope/app/security/metadirectives.py	2009-03-04 20:42:31 UTC (rev 97491)
@@ -18,18 +18,7 @@
 from zope.interface import Interface
 from zope.schema import Id, TextLine
 
-##############################################################################
-# BBB 2006/04/03 -- to be removed after 12 months
 
-import zope.deferredimport
-zope.deferredimport.deprecated(
-    "It has been renamed to zope.security.zcml.IPermissionDirective.  "
-    "This reference will be gone in Zope 3.5",
-    IBaseDefineDirective = 'zope.security.zcml:IPermissionDirective'
-    )
-
-##############################################################################
-
 class IBasePrincipalDirective(Interface):
     """Base interface for principal definition directives."""
 

Modified: zope.app.security/trunk/src/zope/app/security/permission.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/permission.py	2009-03-04 20:39:19 UTC (rev 97490)
+++ zope.app.security/trunk/src/zope/app/security/permission.py	2009-03-04 20:42:31 UTC (rev 97491)
@@ -26,18 +26,7 @@
 
 NULL_ID = _('<permission not activated>')
 
-##############################################################################
-# BBB 2006/04/03 -- to be removed after 12 months
 
-import zope.deferredimport
-zope.deferredimport.deprecatedFrom(
-    "It has been moved to zope.security.permission.  This reference "
-    "will be gone in Zope 3.5", 'zope.security.permission',
-    'Permission', 'checkPermission', 'allPermissions'
-    )
-
-##############################################################################
-
 class LocalPermission(Persistent, Location):
     implements(IPermission)