[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/ Move IVocabularyFactory to zope.schema.interfaces.

Philipp von Weitershausen philikon at philikon.de
Fri Apr 7 11:51:13 EDT 2006


Log message for revision 66650:
  Move IVocabularyFactory to zope.schema.interfaces.
  Note that this doesn't require BBB. IVocabularyFactory's location at
  zope.app.schema.interfaces was introduced only a month back, therefore
  never released.
  

Changed:
  U   Zope3/branches/jim-adapter/src/bugtracker/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/authentication/password.py
  U   Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/cache/caching.py
  U   Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/component/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/content/__init__.py
  U   Zope3/branches/jim-adapter/src/zope/app/interface/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/mail/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/publisher/browser/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/renderer/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/renderer/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/schema/interfaces.py
  U   Zope3/branches/jim-adapter/src/zope/app/schema/metaconfigure.py
  U   Zope3/branches/jim-adapter/src/zope/app/schema/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/security/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/vocabulary.py
  U   Zope3/branches/jim-adapter/src/zope/app/sqlscript/sqlscript.py
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/definition.py
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/definition.py
  U   Zope3/branches/jim-adapter/src/zope/schema/interfaces.py

-=-
Modified: Zope3/branches/jim-adapter/src/bugtracker/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/bugtracker/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -21,12 +21,12 @@
 from zope.interface import implements, classProvides
 from zope.schema.interfaces import ITokenizedTerm, ITitledTokenizedTerm
 from zope.schema.interfaces import IVocabulary, IVocabularyTokenized
+from zope.schema.interfaces import IVocabularyFactory
 from zope.schema.vocabulary import getVocabularyRegistry
 from zope.security.proxy import removeSecurityProxy 
 from zope.annotation.interfaces import IAnnotatable, IAnnotations
 
 from zope.app import zapi
-from zope.app.schema.interfaces import IVocabularyFactory
 
 from bugtracker.interfaces import IManagableVocabulary, IBugTracker
 from bugtracker.interfaces import IStatusVocabulary

Modified: Zope3/branches/jim-adapter/src/zope/app/authentication/password.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/authentication/password.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/authentication/password.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -20,7 +20,7 @@
 import sha
 
 from zope.interface import implements, classProvides
-from zope.app.schema.interfaces import IVocabularyFactory
+from zope.schema.interfaces import IVocabularyFactory
 from zope.app.component.vocabulary import UtilityVocabulary
 
 from zope.app.authentication.interfaces import IPasswordManager

Modified: Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/authentication/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -22,11 +22,11 @@
 from zope import interface, component, i18n
 from zope.interface.interfaces import IInterface
 from zope.schema import vocabulary
+from zope.schema.interfaces import IVocabularyFactory
 
 import zope.app.dublincore.interfaces
 from zope.app.component.interfaces import ILocalUtility
 from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.schema.interfaces import IVocabularyFactory
 
 from zope.app.authentication import interfaces
 

Modified: Zope3/branches/jim-adapter/src/zope/app/cache/caching.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/cache/caching.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/cache/caching.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -19,10 +19,10 @@
 
 from zope.interface import classProvides
 from zope.component import ComponentLookupError
+from zope.schema.interfaces import IVocabularyFactory
 from zope.app import zapi
 from zope.app.cache.interfaces import ICacheable, ICache
 from zope.app.component.vocabulary import UtilityVocabulary
-from zope.app.schema.interfaces import IVocabularyFactory
 
 def getCacheForObject(obj):
     """Returns the cache associated with `obj` or ``None``."""

Modified: Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml	2006-04-07 15:51:07 UTC (rev 66650)
@@ -133,7 +133,7 @@
 
   <utility
       component=".vocabulary.UtilityComponentInterfacesVocabulary"
-      provides="zope.app.schema.interfaces.IVocabularyFactory"
+      provides="zope.schema.interfaces.IVocabularyFactory"
       name="Utility Component Interfaces"
       />
 

Modified: Zope3/branches/jim-adapter/src/zope/app/component/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/component/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -19,20 +19,17 @@
 """
 __docformat__ = "reStructuredText"
 
+import zope.component
 from zope.interface import implements, classProvides, Interface
 from zope.interface.interfaces import IInterface
 from zope.interface.verify import verifyObject
 from zope.schema.interfaces import IVocabulary, IVocabularyTokenized
-from zope.schema.interfaces import ITokenizedTerm
+from zope.schema.interfaces import ITokenizedTerm, IVocabularyFactory
 
-from zope.app import zapi
 from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.schema.interfaces import IVocabularyFactory
 from zope.app.interface.vocabulary import ObjectInterfacesVocabulary
-
 from zope.app.component.interfaces import IUtilityRegistration
 
-
 class UtilityTerm(object):
     """A term representing a utility.
 
@@ -191,10 +188,10 @@
             self.nameOnly = bool(kw.get('nameOnly', False))
             interface = kw.get('interface', Interface)
             if isinstance(interface, (str, unicode)):
-                interface = zapi.getUtility(IInterface, interface)
+                interface = zope.component.getUtility(IInterface, interface)
             self.interface = interface
 
-        utils = zapi.getUtilitiesFor(self.interface, context)
+        utils = zope.component.getUtilitiesFor(self.interface, context)
         self._terms = dict(
             (name, UtilityTerm(self.nameOnly and name or util, name))
             for name, util in utils)
@@ -349,7 +346,7 @@
         self.interface = interface
 
     def __contains__(self, value):
-        return zapi.queryUtility(self.interface, value) is not None
+        return zope.component.queryUtility(self.interface, value) is not None
 
     def getTerm(self, value):
         if value in self:
@@ -357,7 +354,7 @@
         raise ValueError(value)
 
     def getTermByToken(self, token):
-        for name, ut in zapi.getUtilitiesFor(self.interface):
+        for name, ut in zope.component.getUtilitiesFor(self.interface):
             name = unicode(name)
             if token == "t":
                 if not name:
@@ -369,9 +366,9 @@
         return self.getTerm(name)
 
     def __iter__(self):
-        for name, ut in zapi.getUtilitiesFor(self.interface):
+        for name, ut in zope.component.getUtilitiesFor(self.interface):
             yield UtilityNameTerm(name)
 
     def __len__(self):
         """Return the number of valid terms, or sys.maxint."""
-        return len(list(zapi.getUtilitiesFor(self.interface)))
+        return len(list(zope.component.getUtilitiesFor(self.interface)))

Modified: Zope3/branches/jim-adapter/src/zope/app/content/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/content/__init__.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/content/__init__.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -17,8 +17,8 @@
 """
 __docformat__ = 'restructuredtext'
 from zope.interface import classProvides
+from zope.schema.interfaces import IVocabularyFactory
 from zope.app.interface import queryType
-from zope.app.schema.interfaces import IVocabularyFactory
 from zope.app.content.interfaces import IContentType
 from zope.app.component.vocabulary import UtilityVocabulary
 

Modified: Zope3/branches/jim-adapter/src/zope/app/interface/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/interface/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/interface/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -20,8 +20,8 @@
 from zope.interface import classProvides, providedBy
 from zope.security.proxy import removeSecurityProxy
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm 
+from zope.schema.interfaces import IVocabularyFactory
 from zope.app.component.interface import interfaceToName
-from zope.app.schema.interfaces import IVocabularyFactory
 
 
 class ObjectInterfacesVocabulary(SimpleVocabulary):

Modified: Zope3/branches/jim-adapter/src/zope/app/mail/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/mail/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -18,7 +18,7 @@
 __docformat__ = 'restructuredtext'
 
 from zope.interface import classProvides
-from zope.app.schema.interfaces import IVocabularyFactory
+from zope.schema.interfaces import IVocabularyFactory
 from zope.app.component.vocabulary import UtilityVocabulary
 
 class MailDeliveryNames(UtilityVocabulary):

Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/browser/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/browser/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/browser/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -17,8 +17,8 @@
 """
 from zope.interface import classProvides
 from zope.publisher.interfaces.browser import IBrowserSkinType
+from zope.schema.interfaces import IVocabularyFactory
 from zope.app.component.vocabulary import UtilityVocabulary
-from zope.app.schema.interfaces import IVocabularyFactory
 
 class BrowserSkinsVocabulary(UtilityVocabulary):
     classProvides(IVocabularyFactory)

Modified: Zope3/branches/jim-adapter/src/zope/app/renderer/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/renderer/configure.zcml	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/renderer/configure.zcml	2006-04-07 15:51:07 UTC (rev 66650)
@@ -7,7 +7,7 @@
 
   <utility
       component=".vocabulary.SourceTypeVocabulary"
-      provides="zope.app.schema.interfaces.IVocabularyFactory"
+      provides="zope.schema.interfaces.IVocabularyFactory"
       name="SourceTypes"
       />
 

Modified: Zope3/branches/jim-adapter/src/zope/app/renderer/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/renderer/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/renderer/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -15,16 +15,15 @@
 
 $Id$
 """
+import zope.component
 from zope.interface import alsoProvides
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
-
-from zope.app import zapi
+from zope.schema.interfaces import IVocabularyFactory
 from zope.app.renderer.interfaces import ISource
-from zope.app.schema.interfaces import IVocabularyFactory
 
 def SourceTypeVocabulary(context):
     return SimpleVocabulary(
         [SimpleTerm(name, title=factory.title) for name, factory in 
-         zapi.getFactoriesFor(ISource)])
+         zope.component.getFactoriesFor(ISource)])
 
 alsoProvides(SourceTypeVocabulary, IVocabularyFactory)

Modified: Zope3/branches/jim-adapter/src/zope/app/schema/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schema/interfaces.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/schema/interfaces.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -19,13 +19,6 @@
 from zope.interface.interfaces import IInterface
 from zope.app.container.interfaces import IAdding
 
-class IVocabularyFactory(Interface):
-    """Can create vocabularies."""
-
-    def __call__(self, context):
-        """The context provides a location that the vocabulary can make use
-        of."""
-
 class ISchemaUtility(Interface):
     pass
 

Modified: Zope3/branches/jim-adapter/src/zope/app/schema/metaconfigure.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schema/metaconfigure.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/schema/metaconfigure.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -17,7 +17,7 @@
 """
 import warnings
 from zope.interface import directlyProvides
-from zope.app.schema.interfaces import IVocabularyFactory
+from zope.schema.interfaces import IVocabularyFactory
 from zope.app.component.metaconfigure import utility
 
 class FactoryKeywordPasser(object):
@@ -42,7 +42,7 @@
         "removed in Zope 3.5.  Use the 'utility' directive instead to "
         "register the class as a named utility:\n"
         '  <utility\n'
-        '      provides="zope.app.schema.interfaces.IVocabularyFactory"\n'
+        '      provides="zope.schema.interfaces.IVocabularyFactory"\n'
         '      component="%s"\n'
         '      name="%s"\n'
         '      />' % (dottedname, name),

Modified: Zope3/branches/jim-adapter/src/zope/app/schema/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schema/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/schema/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -15,12 +15,12 @@
 
 $Id$
 """
-from zope.app import zapi
+import zope.component
 from zope.interface import Interface, implements
 from zope.schema.interfaces import IVocabularyRegistry
 from zope.schema import vocabulary
 from zope.testing import cleanup
-from zope.app.schema.interfaces import IVocabularyFactory
+from zope.schema.interfaces import IVocabularyFactory
 
 class ZopeVocabularyRegistry(object):
     """IVocabularyRegistry that supports global and local utilities."""
@@ -30,7 +30,7 @@
 
     def get(self, context, name):
         """See zope.schema.interfaces.IVocabularyRegistry"""
-        factory = zapi.getUtility(IVocabularyFactory, name)
+        factory = zope.component.getUtility(IVocabularyFactory, name)
         return factory(context)
 
 def _clear():
@@ -43,6 +43,5 @@
     vocabulary._clear()
     vocabulary.setVocabularyRegistry(ZopeVocabularyRegistry())
 
-
 _clear()
 cleanup.addCleanUp(_clear)

Modified: Zope3/branches/jim-adapter/src/zope/app/security/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/security/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/security/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -17,19 +17,18 @@
 
 $Id$
 """
+import zope.component
 from zope.interface import implements, classProvides
 from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
-from zope.schema.interfaces import ISourceQueriables
+from zope.schema.interfaces import ISourceQueriables, IVocabularyFactory
 from zope.security.interfaces import IPermission
 from zope.security.checker import CheckerPublic
 
-from zope.app import zapi
 from zope.app.security.interfaces import IAuthentication
 from zope.app.security.interfaces import PrincipalLookupError
 from zope.app.security.interfaces import IPrincipalSource
 from zope.app.component import queryNextUtility
 from zope.app.component.vocabulary import UtilityVocabulary
-from zope.app.schema.interfaces import IVocabularyFactory
 
 class PermissionsVocabulary(UtilityVocabulary):
     classProvides(IVocabularyFactory)
@@ -99,7 +98,7 @@
 
     def __init__(self, context):
         terms = []
-        permissions = zapi.getUtilitiesFor(IPermission, context)
+        permissions = zope.component.getUtilitiesFor(IPermission, context)
         for name, permission in permissions:
             if name == 'zope.Public':
                 terms.append(SimpleTerm(
@@ -137,8 +136,8 @@
         simply monkey patch the `getUtility()` method to always return our
         dummy authentication utility.
 
-        >>> temp = zapi.getUtility
-        >>> zapi.getUtility = lambda iface: DummyUtility()
+        >>> temp = zope.component.getUtility
+        >>> zope.component.getUtility = lambda iface: DummyUtility()
 
         Now initialize the principal source and test the method
 
@@ -150,9 +149,9 @@
 
         Now revert our patch.
 
-        >>> zapi.getUtility = temp
+        >>> zope.component.getUtility = temp
         """
-        auth = zapi.getUtility(IAuthentication)
+        auth = zope.component.getUtility(IAuthentication)
         try:
             auth.getPrincipal(id)
         except PrincipalLookupError:
@@ -191,17 +190,17 @@
         >>> testingNextUtility(dummy1, dummy2, IAuthentication)
         >>> testingNextUtility(dummy2, dummy3, IAuthentication)
 
-        >>> temp = zapi.getUtility
-        >>> zapi.getUtility = lambda iface: dummy1
+        >>> temp = zope.component.getUtility
+        >>> zope.component.getUtility = lambda iface: dummy1
 
         >>> source = PrincipalSource()
         >>> list(source.getQueriables())
         [(u'0', dummy1), (u'1.1', 1), (u'1.2', 2), (u'1.3', 3), (u'2.4', 4)]
 
-        >>> zapi.getUtility = temp
+        >>> zope.component.getUtility = temp
         """
         i = 0
-        auth = zapi.getUtility(IAuthentication)
+        auth = zope.component.getUtility(IAuthentication)
         yielded = []
         while True:
             queriables = ISourceQueriables(auth, None)

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/vocabulary.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/vocabulary.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -17,10 +17,11 @@
 
 $Id$
 """
+import zope.component
 from zope.interface import implements, classProvides
 from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
-from zope.app import zapi
-from zope.app.schema.interfaces import IVocabularyFactory
+from zope.schema.interfaces import IVocabularyFactory
+
 from zope.app.securitypolicy.interfaces import IRole
 from zope.app.securitypolicy.interfaces import IGrantVocabulary
 
@@ -62,7 +63,7 @@
 
     def __init__(self, context):
         terms = []
-        roles = zapi.getUtilitiesFor(IRole, context)
+        roles = zope.component.getUtilitiesFor(IRole, context)
         for name, role in roles:
             terms.append(SimpleTerm(name, name, name))
         super(RoleIdsVocabulary, self).__init__(terms)

Modified: Zope3/branches/jim-adapter/src/zope/app/sqlscript/sqlscript.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/sqlscript/sqlscript.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/sqlscript/sqlscript.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -21,13 +21,13 @@
 from persistent import Persistent
 from persistent.dict import PersistentDict
 
+import zope.component
 from zope.interface import implements, classProvides
 from zope.interface.common.mapping import IEnumerableMapping
+from zope.schema.interfaces import IVocabularyFactory
 
-from zope.app import zapi
 from zope.app.rdb import queryForResults
 from zope.app.container.contained import Contained
-from zope.app.schema.interfaces import IVocabularyFactory
 from zope.app.component.vocabulary import UtilityVocabulary
 from zope.app.cache.caching import getCacheForObject, getLocationForCache
 from zope.app.rdb.interfaces import IZopeDatabaseAdapter
@@ -105,7 +105,7 @@
 
     def getConnection(self):
         name = self.connectionName
-        connection = zapi.getUtility(IZopeDatabaseAdapter, name)
+        connection = zope.component.getUtility(IZopeDatabaseAdapter, name)
         return connection()
 
     def __call__(self, **kw):

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/definition.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/definition.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/definition.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -18,14 +18,12 @@
 from persistent import Persistent
 from persistent.dict import PersistentDict
 
+import zope.component
 from zope.interface import implements, classProvides
-
-from zope.schema.interfaces import ITokenizedTerm
 from zope.schema.interfaces import IVocabularyTokenized
+from zope.schema.interfaces import ITokenizedTerm, IVocabularyFactory
 
-from zope.app import zapi
 from zope.app.container.contained import Contained, setitem, uncontained
-from zope.app.schema.interfaces import IVocabularyFactory
 from zope.app.workflow.interfaces import IProcessDefinitionElementContainer
 from zope.app.workflow.interfaces import IProcessDefinition
 
@@ -111,7 +109,7 @@
     classProvides(IVocabularyFactory)
 
     def __init__(self, context):
-        self.sm = zapi.getSiteManager(context)
+        self.sm = zope.component.getSiteManager(context)
 
     def __names(self):
         return [name

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/definition.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/definition.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/definition.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -20,6 +20,7 @@
 
 from zope.interface import implements, classProvides
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
+from zope.schema.interfaces import IVocabularyFactory
 from zope.security.checker import CheckerPublic
 from zope.event import notify
 from zope.component.interfaces import ObjectEvent
@@ -27,7 +28,6 @@
 
 from zope.app.container.interfaces import IReadContainer
 from zope.app.container.contained import Contained, containedEvent
-from zope.app.schema.interfaces import IVocabularyFactory
 from zope.app.workflow.definition import ProcessDefinition
 from zope.app.workflow.definition import ProcessDefinitionElementContainer
 from zope.app.workflow.stateful.interfaces import IStatefulProcessDefinition

Modified: Zope3/branches/jim-adapter/src/zope/schema/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/schema/interfaces.py	2006-04-07 14:36:17 UTC (rev 66649)
+++ Zope3/branches/jim-adapter/src/zope/schema/interfaces.py	2006-04-07 15:51:07 UTC (rev 66650)
@@ -579,3 +579,10 @@
 
         When the vocabulary cannot be found, LookupError is raised.
         """
+
+class IVocabularyFactory(Interface):
+    """Can create vocabularies."""
+
+    def __call__(self, context):
+        """The context provides a location that the vocabulary can make use
+        of."""



More information about the Zope3-Checkins mailing list