[Checkins] SVN: zc.form/trunk/ - broke dependency on zope.app.securitypolicy

Michael Howitz mh at gocept.com
Fri Sep 23 03:06:36 EST 2011


Log message for revision 122900:
  - broke dependency on zope.app.securitypolicy 
  - Depending on ``zope.security`` instead of ``zope.app.security``.
  

Changed:
  U   zc.form/trunk/CHANGES.txt
  U   zc.form/trunk/setup.py
  U   zc.form/trunk/src/zc/form/browser/ftesting.zcml
  U   zc.form/trunk/src/zc/form/browser/tests.py

-=-
Modified: zc.form/trunk/CHANGES.txt
===================================================================
--- zc.form/trunk/CHANGES.txt	2011-09-23 07:48:21 UTC (rev 122899)
+++ zc.form/trunk/CHANGES.txt	2011-09-23 08:06:36 UTC (rev 122900)
@@ -10,9 +10,15 @@
 
 - Depending on ``zope.catalog`` instead of ``zope.app.catalog``.
 
-- Got rid of ``zope.app.zapi``, ``zope.app.basicskin``,
-  ``zope.app.zcmlfiles`` dependencies
+- Depending on ``zope.security`` instead of ``zope.app.security``.
 
+- Got rid of the following dependencies:
+
+  - ``zope.app.basicskin``
+  - ``zope.app.securitypolicy``
+  - ``zope.app.zapi``
+  - ``zope.app.zcmlfiles``
+
 - Fixed tests to run with ``zope.schema`` >= 3.6.
 
 - Using Python's ``doctest`` module instead of depreacted

Modified: zc.form/trunk/setup.py
===================================================================
--- zc.form/trunk/setup.py	2011-09-23 07:48:21 UTC (rev 122899)
+++ zc.form/trunk/setup.py	2011-09-23 08:06:36 UTC (rev 122900)
@@ -43,9 +43,8 @@
         'zope.publisher',
         'zope.schema >= 3.6',
         # extras
-        'zope.app.security',
+        'zope.security',
         'zope.app.appsetup',
-        'zope.app.securitypolicy',
         'zope.app.testing',
         'zope.configuration',
         'zope.testing',

Modified: zc.form/trunk/src/zc/form/browser/ftesting.zcml
===================================================================
--- zc.form/trunk/src/zc/form/browser/ftesting.zcml	2011-09-23 07:48:21 UTC (rev 122899)
+++ zc.form/trunk/src/zc/form/browser/ftesting.zcml	2011-09-23 08:06:36 UTC (rev 122900)
@@ -6,7 +6,7 @@
     >
 
   <include package="zope.component" file="meta.zcml" />
-  <include package="zope.app.security" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml" />
   <include package="zope.app.component" file="meta.zcml" />
   <include package="zope.app.publisher" file="meta.zcml" />
   <include package="zope.app.publication" file="meta.zcml" />
@@ -14,7 +14,7 @@
   <include package="zc.resourcelibrary" file="meta.zcml" />
 
   <include package="zope.component" />
-  <include package="zope.app.security" />
+  <include package="zope.security" />
   <include package="zope.app.component" />
   <include package="zope.app.container" />
   <include package="zope.publisher" />

Modified: zc.form/trunk/src/zc/form/browser/tests.py
===================================================================
--- zc.form/trunk/src/zc/form/browser/tests.py	2011-09-23 07:48:21 UTC (rev 122899)
+++ zc.form/trunk/src/zc/form/browser/tests.py	2011-09-23 08:06:36 UTC (rev 122900)
@@ -31,7 +31,6 @@
 from zope.publisher.browser import TestRequest
 
 from zope.configuration import xmlconfig
-import zope.app.security
 import zc.form.browser
 from zc.form.field import Union
 import zc.form.field



More information about the checkins mailing list