[Checkins] SVN: zope.securitypolicy/trunk/ Make test work in complete test run and get ready for release.

[Stephan Richter]

Log message for revision 102198:
  Make test work in complete test run and get ready for release.
  

Changed:
  U   zope.securitypolicy/trunk/CHANGES.txt
  U   zope.securitypolicy/trunk/setup.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py

-=-
Modified: zope.securitypolicy/trunk/CHANGES.txt
===================================================================
--- zope.securitypolicy/trunk/CHANGES.txt	2009-07-24 05:16:12 UTC (rev 102197)
+++ zope.securitypolicy/trunk/CHANGES.txt	2009-07-24 06:18:13 UTC (rev 102198)
@@ -2,16 +2,17 @@
 CHANGES
 =======
 
-3.6.1 (unreleased)
+3.6.1 (2009-07-24)
 ------------------
 
-- ...
+- Make tests work when the default and Zope vocabulary registry compete in the
+  cleanup.
 
 3.6.0 (2009-03-14)
 ------------------
 
 - Change ``zope.app.security`` dependency to the new ``zope.authentication``
-  package, dropping a big number of unused dependencies. 
+  package, dropping a big number of unused dependencies.
 
 - Get rid of ``zope.app.testing`` and other testing dependencices.
 
@@ -35,7 +36,7 @@
   implementation, because __*__ name pattern is reserved for special
   names in python.
 
-- Add security protections for the `PermissionSetting`. 
+- Add security protections for the `PermissionSetting`.
 
 - Improve documentation formatting, add it to the package's long
   description.
@@ -60,7 +61,7 @@
 
 - Remove explicit dependency on zope.app.form from ``setup.py``; nothing
   in the code directly depends on this.
- 
+
 3.4.1 (2008-06-02)
 ------------------
 

Modified: zope.securitypolicy/trunk/setup.py
===================================================================
--- zope.securitypolicy/trunk/setup.py	2009-07-24 05:16:12 UTC (rev 102197)
+++ zope.securitypolicy/trunk/setup.py	2009-07-24 06:18:13 UTC (rev 102198)
@@ -24,7 +24,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.securitypolicy',
-    version = '3.6.1dev',
+    version = '3.6.1',
     author='Zope Corporation and Contributors',
     author_email='zope-dev at zope.org',
     description='Default security policy for Zope3',

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py	2009-07-24 05:16:12 UTC (rev 102197)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py	2009-07-24 06:18:13 UTC (rev 102198)
@@ -36,10 +36,12 @@
 
     To illustrate, we need to register the role IDs vocab:
 
+    >>> from zope.schema import vocabulary
     >>> from zope.component.testing import setUp, tearDown
     >>> setUp()
-    >>> from zope.schema.vocabulary import getVocabularyRegistry
-    >>> registry = getVocabularyRegistry()
+    >>> vocabulary.setVocabularyRegistry(None)
+
+    >>> registry = vocabulary.getVocabularyRegistry()
     >>> registry.register('Role Ids', RoleIdsVocabulary)
 
     Let's register some sample roles to test against them