[Checkins] SVN: zope.app.undo/trunk/ Use ``zope.authentication`` instead of ``zope.app.security``.

Dan Korostelev nadako at gmail.com
Sat Mar 14 13:56:45 EDT 2009


Log message for revision 98107:
  Use ``zope.authentication`` instead of ``zope.app.security``.
  Remove zcml slug file and zpkg stuff.
  

Changed:
  U   zope.app.undo/trunk/CHANGES.txt
  U   zope.app.undo/trunk/setup.py
  D   zope.app.undo/trunk/src/zope/app/undo/SETUP.cfg
  U   zope.app.undo/trunk/src/zope/app/undo/__init__.py
  U   zope.app.undo/trunk/src/zope/app/undo/tests/test_undoview.py
  U   zope.app.undo/trunk/src/zope/app/undo/tests/test_zodbundomanager.py
  D   zope.app.undo/trunk/src/zope/app/undo/undo-configure.zcml

-=-
Modified: zope.app.undo/trunk/CHANGES.txt
===================================================================
--- zope.app.undo/trunk/CHANGES.txt	2009-03-14 17:47:46 UTC (rev 98106)
+++ zope.app.undo/trunk/CHANGES.txt	2009-03-14 17:56:45 UTC (rev 98107)
@@ -5,8 +5,10 @@
 3.5.1 (unreleased)
 ------------------
 
-- ...
+- Use ``zope.authentication`` instead of ``zope.app.security``.
 
+- Remove zcml slug file and zpkg stuff.
+
 3.5.0 (2009-02-01)
 ------------------
 

Modified: zope.app.undo/trunk/setup.py
===================================================================
--- zope.app.undo/trunk/setup.py	2009-03-14 17:47:46 UTC (rev 98106)
+++ zope.app.undo/trunk/setup.py	2009-03-14 17:56:45 UTC (rev 98107)
@@ -47,12 +47,13 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
-      extras_require = dict(test=['zope.app.testing',
-                                  'zope.app.component',
+      extras_require = dict(test=['zope.app.component',
+                                  'zope.app.testing',
+                                  'zope.principalregistry',
                                   'zope.site',
                                   'zope.testing']),
       install_requires = ['setuptools',
-                          'zope.app.security',
+                          'zope.authentication',
                           'zope.component',
                           'zope.interface',
                           'zope.location',

Deleted: zope.app.undo/trunk/src/zope/app/undo/SETUP.cfg
===================================================================
--- zope.app.undo/trunk/src/zope/app/undo/SETUP.cfg	2009-03-14 17:47:46 UTC (rev 98106)
+++ zope.app.undo/trunk/src/zope/app/undo/SETUP.cfg	2009-03-14 17:56:45 UTC (rev 98107)
@@ -1,5 +0,0 @@
-# Tell zpkg how to install the ZCML slugs.
-
-<data-files zopeskel/etc/package-includes>
-  undo-*.zcml
-</data-files>

Modified: zope.app.undo/trunk/src/zope/app/undo/__init__.py
===================================================================
--- zope.app.undo/trunk/src/zope/app/undo/__init__.py	2009-03-14 17:47:46 UTC (rev 98106)
+++ zope.app.undo/trunk/src/zope/app/undo/__init__.py	2009-03-14 17:56:45 UTC (rev 98107)
@@ -21,12 +21,13 @@
 
 import transaction
 import zope.component
+from zope.authentication.interfaces import IAuthentication
+from zope.authentication.interfaces import PrincipalLookupError
 from zope.interface import implements
+from zope.security.interfaces import IPrincipal
 from zope.traversing.interfaces import IPhysicallyLocatable
 
 from zope.app.undo.interfaces import IUndoManager, UndoError
-from zope.app.security.interfaces import IAuthentication, IPrincipal
-from zope.app.security.interfaces import PrincipalLookupError
 
 def undoSetup(event):
     # setup undo functionality

Modified: zope.app.undo/trunk/src/zope/app/undo/tests/test_undoview.py
===================================================================
--- zope.app.undo/trunk/src/zope/app/undo/tests/test_undoview.py	2009-03-14 17:47:46 UTC (rev 98106)
+++ zope.app.undo/trunk/src/zope/app/undo/tests/test_undoview.py	2009-03-14 17:56:45 UTC (rev 98107)
@@ -18,14 +18,14 @@
 from datetime import datetime
 from unittest import TestCase, main, makeSuite
 
+from zope.component import provideUtility
 from zope.interface import implements
+from zope.principalregistry.principalregistry import principalRegistry
 from zope.publisher.browser import TestRequest
 
-from zope.app.testing import ztapi
 from zope.app.component.testing import PlacefulSetup
 from zope.app.undo.interfaces import IUndoManager
 from zope.app.undo.browser import UndoView
-from zope.app.security.principalregistry import principalRegistry
 
 class TestIUndoManager(object):
     implements(IUndoManager)
@@ -87,7 +87,7 @@
         super(Test, self).setUp()
         self.request = TestRequest()
         self.undo = TestIUndoManager()
-        ztapi.provideUtility(IUndoManager, self.undo)
+        provideUtility(self.undo, IUndoManager)
         principalRegistry.definePrincipal('monkey', 'Monkey Patch',
                                           login='monkey')
         principalRegistry.definePrincipal('bonobo', 'Bonobo Abdul-Fasil',

Modified: zope.app.undo/trunk/src/zope/app/undo/tests/test_zodbundomanager.py
===================================================================
--- zope.app.undo/trunk/src/zope/app/undo/tests/test_zodbundomanager.py	2009-03-14 17:47:46 UTC (rev 98106)
+++ zope.app.undo/trunk/src/zope/app/undo/tests/test_zodbundomanager.py	2009-03-14 17:56:45 UTC (rev 98107)
@@ -27,14 +27,14 @@
 from zope.component.testing import PlacelessSetup
 from zope.location import Location
 from zope.location.traversing import LocationPhysicallyLocatable
+from zope.principalregistry.principalregistry import PrincipalRegistry
 from zope.security.interfaces import IPrincipal
 
-from zope.app.security.principalregistry import PrincipalRegistry
+from zope.authentication.interfaces import IAuthentication, PrincipalLookupError
 from zope.location.interfaces import ISite
 from zope.site import queryNextUtility
 from zope.site.hooks import setSite, setHooks
 from zope.site.site import SiteManagerAdapter
-from zope.app.security.interfaces import IAuthentication, PrincipalLookupError
 
 from zope.app.undo import ZODBUndoManager
 from zope.app.undo.interfaces import UndoError
@@ -129,7 +129,7 @@
         zope.component.provideAdapter(SiteManagerAdapter)
 
         # define global principals
-        from zope.app.security.principalregistry import principalRegistry
+        from zope.principalregistry.principalregistry import principalRegistry
         principalRegistry.definePrincipal('jim', 'Jim Fulton', login='jim')
         principalRegistry.definePrincipal('anthony', 'Anthony Baxter',
                                           login='anthony')

Deleted: zope.app.undo/trunk/src/zope/app/undo/undo-configure.zcml
===================================================================
--- zope.app.undo/trunk/src/zope/app/undo/undo-configure.zcml	2009-03-14 17:47:46 UTC (rev 98106)
+++ zope.app.undo/trunk/src/zope/app/undo/undo-configure.zcml	2009-03-14 17:56:45 UTC (rev 98107)
@@ -1 +0,0 @@
-<include package="zope.app.undo" />
\ No newline at end of file



More information about the Checkins mailing list