[Checkins] SVN: zope.security/trunk/ Fold in a ZCML doctest.
Tres Seaver
cvs-admin at zope.org
Sun Dec 23 20:54:13 UTC 2012
Log message for revision 128881:
Fold in a ZCML doctest.
Changed:
_U zope.security/trunk/
U zope.security/trunk/docs/api/zcml.rst
D zope.security/trunk/src/zope/security/tests/configure.txt
D zope.security/trunk/src/zope/security/tests/test_configure.py
-=-
Modified: zope.security/trunk/docs/api/zcml.rst
===================================================================
--- zope.security/trunk/docs/api/zcml.rst 2012-12-23 20:54:12 UTC (rev 128880)
+++ zope.security/trunk/docs/api/zcml.rst 2012-12-23 20:54:13 UTC (rev 128881)
@@ -1,6 +1,36 @@
:mod:`zope.security.zcml`
===============================
+Configuring security via ZCML
+-----------------------------
+
+:mod:`zope.security` provides a ZCML file that configures some utilities and
+a couple of permissions:
+
+.. doctest::
+
+ >>> from zope.component import getGlobalSiteManager
+ >>> from zope.configuration.xmlconfig import XMLConfig
+ >>> import zope.security
+
+ >>> XMLConfig('permissions.zcml', zope.security)()
+
+ >>> len(list(getGlobalSiteManager().registeredUtilities()))
+ 7
+
+Clear the current state:
+
+.. doctest::
+
+ >>> from zope.component.testing import setUp, tearDown
+ >>> tearDown()
+ >>> setUp()
+
+ >>> XMLConfig('configure.zcml', zope.security)()
+
+ >>> len(list(getGlobalSiteManager().registeredUtilities()))
+ 10
+
.. autoclass:: zope.security.zcml.Permission
:members:
:member-order: bysource
Deleted: zope.security/trunk/src/zope/security/tests/configure.txt
===================================================================
--- zope.security/trunk/src/zope/security/tests/configure.txt 2012-12-23 20:54:12 UTC (rev 128880)
+++ zope.security/trunk/src/zope/security/tests/configure.txt 2012-12-23 20:54:13 UTC (rev 128881)
@@ -1,24 +0,0 @@
-Package configuration
-=====================
-
-The ``zope.security`` package provides a ZCML file that configures some
-utilities and a couple of permissions:
-
- >>> from zope.configuration.xmlconfig import XMLConfig
- >>> import zope.security
-
- >>> XMLConfig('permissions.zcml', zope.security)()
-
- >>> len(list(zope.component.getGlobalSiteManager().registeredUtilities()))
- 7
-
-Clear the current state:
-
- >>> from zope.component.testing import setUp, tearDown
- >>> tearDown()
- >>> setUp()
-
- >>> XMLConfig('configure.zcml', zope.security)()
-
- >>> len(list(zope.component.getGlobalSiteManager().registeredUtilities()))
- 10
Deleted: zope.security/trunk/src/zope/security/tests/test_configure.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_configure.py 2012-12-23 20:54:12 UTC (rev 128880)
+++ zope.security/trunk/src/zope/security/tests/test_configure.py 2012-12-23 20:54:13 UTC (rev 128881)
@@ -1,30 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2010 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-import unittest
-
-
-def test_suite():
- suite = unittest.TestSuite()
-
- try:
- import zope.configuration
- except ImportError:
- pass
- else:
- import doctest
- from zope.component.testing import setUp, tearDown
- suite.addTest(doctest.DocFileSuite('configure.txt',
- setUp=setUp, tearDown=tearDown))
-
- return suite
More information about the checkins
mailing list