Factor out zope.schema.vocabulary support

src/Zope2/App/schema.py

@@ -16,6 +16,7 @@ from zope.component import getUtility
 from zope.interface import implements
 from zope.schema.interfaces import IVocabularyFactory
 from zope.schema.interfaces import IVocabularyRegistry
+from zope.schema.vocabulary import setVocabularyRegistry
 
 
 class Zope2VocabularyRegistry(object):
@@ -30,3 +31,7 @@ class Zope2VocabularyRegistry(object):
         """
         factory = getUtility(IVocabularyFactory, name)
         return factory(context)
+
+
+def configure_vocabulary_registry():
+    setVocabularyRegistry(Zope2VocabularyRegistry())

src/Zope2/App/startup.py

@@ -16,7 +16,6 @@
 from zope.component import queryMultiAdapter
 from zope.event import notify
 from zope.processlifetime import DatabaseOpened
-from zope.schema.vocabulary import setVocabularyRegistry
 
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
@@ -110,8 +109,8 @@ def startup():
     load_site()
 
     # Set up Zope2 specific vocabulary registry
-    from .schema import Zope2VocabularyRegistry
-    setVocabularyRegistry(Zope2VocabularyRegistry())
+    from .schema import configure_vocabulary_registry
+    configure_vocabulary_registry()
 
     # Set up the "app" object that automagically opens
     # connections