--- a/src/pyams_content/component/extfile/__init__.py Mon Oct 24 15:54:38 2016 +0200
+++ b/src/pyams_content/component/extfile/__init__.py Tue Nov 15 09:47:14 2016 +0100
@@ -20,20 +20,20 @@
from pyams_content.shared.common.interfaces import IWfSharedContent
from pyams_form.interfaces.form import IFormContextPermissionChecker
from zope.lifecycleevent.interfaces import IObjectAddedEvent, IObjectModifiedEvent, IObjectRemovedEvent
-from zope.schema.interfaces import IVocabularyFactory
# import packages
from persistent import Persistent
from pyams_i18n.property import I18nFileProperty
from pyams_utils.adapter import adapter_config, ContextAdapter
from pyams_utils.traversing import get_parent
+from pyams_utils.vocabulary import vocabulary_config
from pyramid.events import subscriber
from pyramid.threadlocal import get_current_registry
from zope.container.contained import Contained
-from zope.interface import implementer, provider
+from zope.interface import implementer
from zope.lifecycleevent import ObjectModifiedEvent
from zope.schema.fieldproperty import FieldProperty
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm, getVocabularyRegistry
+from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
from pyams_content import _
@@ -47,7 +47,7 @@
EXTERNAL_FILES_FACTORIES[key] = (factory, name or key)
-@provider(IVocabularyFactory)
+@vocabulary_config(name='PyAMS files factories')
class ExternalFilesFactoriesVocabulary(SimpleVocabulary):
"""External files factories vocabulary"""
@@ -56,8 +56,6 @@
key=lambda x: x.title)
super(ExternalFilesFactoriesVocabulary, self).__init__(terms)
-getVocabularyRegistry().register('PyAMS files factories', ExternalFilesFactoriesVocabulary)
-
@implementer(IBaseExtFile)
class BaseExtFile(Persistent, Contained):