Remove unneeded dependency on deprecated zope.app.security.

Fix issues with buildout-3.4.cfg and/or older python versions.
zopefoundation · Jun 6, 2011 · c18d557 · c18d557
1 parent 0543a19
commit c18d557
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,8 @@ CHANGES
 2.4.4 (unreleased)
 ------------------
 
+- Remove unneeded dependency on deprecated ``zope.app.security``.
+
 
 2.4.3 (2011-05-20)
 ------------------

diff --git a/buildout-3.4.cfg b/buildout-3.4.cfg
@@ -32,3 +32,5 @@ zc.sourcefactory = 0.4.0
 z3c.pt = 1.0.0
 z3c.ptcompat = 0.5.3
 zope.i18n = 3.7.0
+python-gettext = 1.0
+zope.schema = 3.6.0
diff --git a/buildout.cfg b/buildout.cfg
@@ -7,6 +7,7 @@ versions = versions
 [versions]
 z3c.pt = 1.2.1
 Chameleon = 1.2.13
+python-gettext = 1.0
 
 [lxml]
 recipe = z3c.recipe.staticlxml

diff --git a/setup.py b/setup.py
@@ -88,7 +88,6 @@ def read(*rnames):
             # zope.app.container pulls in zope.container, if newer version
             'zope.app.container',
             'zope.app.pagetemplate',
-            'zope.app.security',
             'zope.app.testing',
             'zope.testing',
             ],

diff --git a/src/z3c/form/browser/README.txt b/src/z3c/form/browser/README.txt
@@ -16,15 +16,12 @@ configuration.
   >>> from zope.configuration import xmlconfig
   >>> import zope.component
   >>> import zope.app.component
-  >>> import zope.app.security
   >>> import zope.i18n
   >>> import z3c.form
   >>> xmlconfig.XMLConfig('meta.zcml', zope.component)()
   >>> xmlconfig.XMLConfig('meta.zcml', zope.app.component)()
-  >>> xmlconfig.XMLConfig('meta.zcml', zope.app.security)()
   >>> xmlconfig.XMLConfig('meta.zcml', zope.i18n)()
   >>> xmlconfig.XMLConfig('meta.zcml', z3c.form)()
-  >>> xmlconfig.XMLConfig('configure.zcml', zope.app.security)()
   >>> xmlconfig.XMLConfig('configure.zcml', z3c.form)()
 
 This utility is setup by hand, since its ZCML loads to many unwanted files:

diff --git a/src/z3c/form/tests/test_bugfix.py b/src/z3c/form/tests/test_bugfix.py
@@ -60,3 +60,7 @@ class TestForm(z3c.form.form.BaseForm):
         changes = z3c.form.form.applyChanges(form, content, data)
         self.assertEqual({TestInterface: ['text']}, changes)
         self.assertEqual({'text': 'a'}, content)
+
+
+def test_suite():
+    return unittest.makeSuite(TestApplyChangesDictDatamanager)