[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/ Merged r26177 from trunk.

[Garrett Smith]

Log message for revision 26181:
Merged r26177 from trunk.


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/configure.zcml
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/configure.zcml	2004-07-07 18:54:17 UTC (rev 26180)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/configure.zcml	2004-07-07 18:58:20 UTC (rev 26181)
@@ -15,11 +15,9 @@
       factory="zope.app.utility.vocabulary.UtilityVocabulary"
       interface="zope.app.security.interfaces.IPermission" />
 
-  <vocabulary 
+  <vocabulary
       name="Permission Ids"
-      factory="zope.app.utility.vocabulary.UtilityVocabulary"
-      interface="zope.app.security.interfaces.IPermission" 
-      nameOnly="True" />
+      factory=".vocabulary.PermissionIdsVocabulary" />
 
   <include file="globalmodules.zcml" />
   <include file="_protections.zcml" />

Copied: Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_vocabulary.py (from rev 26180, Zope3/trunk/src/zope/app/security/tests/test_vocabulary.py)

Copied: Zope3/branches/ZopeX3-3.0/src/zope/app/security/vocabulary.py (from rev 26180, Zope3/trunk/src/zope/app/security/vocabulary.py)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tests/placelesssetup.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tests/placelesssetup.py	2004-07-07 18:54:17 UTC (rev 26180)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tests/placelesssetup.py	2004-07-07 18:58:20 UTC (rev 26181)
@@ -16,6 +16,7 @@
 $Id$
 """
 from zope.app.tests import ztapi
+from zope.schema.vocabulary import setVocabularyRegistry
 from zope.component.tests.placelesssetup \
     import PlacelessSetup as CAPlacelessSetup
 from zope.app.event.tests.placelesssetup \
@@ -48,7 +49,9 @@
         from zope.app.security.tests import addCheckerPublic
         addCheckerPublic()
 
+        setVocabularyRegistry(None)
 
+
 ps = PlacelessSetup()
 setUp = ps.setUp
 tearDown = ps.tearDown

Modified: Zope3/branches/ZopeX3-3.0/src/zope/schema/vocabulary.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/schema/vocabulary.py	2004-07-07 18:54:17 UTC (rev 26180)
+++ Zope3/branches/ZopeX3-3.0/src/zope/schema/vocabulary.py	2004-07-07 18:58:20 UTC (rev 26181)
@@ -186,8 +186,6 @@
 def setVocabularyRegistry(registry):
     """Set the vocabulary registry."""
     global _vocabularies
-    if _vocabularies is not None:
-        raise ValueError("vocabulary registry has already been set")
     _vocabularies = registry
 
 def _clear():