[Checkins] SVN: z3c.optionstorage/trunk/ Remove dependency on zope.app.schema.

[Marius Gedminas]

Log message for revision 107632:
  Remove dependency on zope.app.schema.
  
  The vocabulary directive was removed from zope.app.schema
  more than a year ago.
  
  

Changed:
  U   z3c.optionstorage/trunk/CHANGES.txt
  U   z3c.optionstorage/trunk/setup.py
  U   z3c.optionstorage/trunk/src/z3c/optionstorage/DEPENDENCIES.cfg
  U   z3c.optionstorage/trunk/src/z3c/optionstorage/metaconfigure.py

-=-
Modified: z3c.optionstorage/trunk/CHANGES.txt
===================================================================
--- z3c.optionstorage/trunk/CHANGES.txt	2010-01-04 15:17:15 UTC (rev 107631)
+++ z3c.optionstorage/trunk/CHANGES.txt	2010-01-04 15:27:43 UTC (rev 107632)
@@ -2,9 +2,14 @@
 CHANGES
 =======
 
-0.1.4 (2007-11-03)
+1.0.5 (2010-01-04)
 ------------------
 
+- Remove dependency on zope.app.schema.
+
+1.0.4 (2007-11-03)
+------------------
+
 - Fix up package meta data.
 
 0.1.3 (2007-07-04)

Modified: z3c.optionstorage/trunk/setup.py
===================================================================
--- z3c.optionstorage/trunk/setup.py	2010-01-04 15:17:15 UTC (rev 107631)
+++ z3c.optionstorage/trunk/setup.py	2010-01-04 15:27:43 UTC (rev 107632)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Setup for z3c.viewlet package
+"""Setup for z3c.optionstorage package
 
 $Id$
 """
@@ -22,7 +22,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='z3c.optionstorage',
-      version = '1.1.0',
+      version = '1.0.5',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev at zope.org',
       description='Optional Storages -- Persistent, Managable Vocabularies',
@@ -51,12 +51,12 @@
       install_requires = ['setuptools',
                           'ZODB3',
                           'zope.annotation',
+                          'zope.component',
                           'zope.configuration',
                           'zope.deprecation',
                           'zope.i18n',
                           'zope.interface',
                           'zope.proxy',
-                          'zope.app.schema',
                           'zope.schema',
                           'zope.security',
                           'zope.app.pagetemplate',

Modified: z3c.optionstorage/trunk/src/z3c/optionstorage/DEPENDENCIES.cfg
===================================================================
--- z3c.optionstorage/trunk/src/z3c/optionstorage/DEPENDENCIES.cfg	2010-01-04 15:17:15 UTC (rev 107631)
+++ z3c.optionstorage/trunk/src/z3c/optionstorage/DEPENDENCIES.cfg	2010-01-04 15:27:43 UTC (rev 107632)
@@ -1,11 +1,9 @@
 persistent
 zope.annotation
+zope.component
 zope.i18n
 zope.interface
 zope.proxy
 zope.schema
 zope.security
 zope.app.zapi
-
-# BBB 2006/02/24, to be removed after 12 months
-zope.app.schema

Modified: z3c.optionstorage/trunk/src/z3c/optionstorage/metaconfigure.py
===================================================================
--- z3c.optionstorage/trunk/src/z3c/optionstorage/metaconfigure.py	2010-01-04 15:17:15 UTC (rev 107631)
+++ z3c.optionstorage/trunk/src/z3c/optionstorage/metaconfigure.py	2010-01-04 15:27:43 UTC (rev 107632)
@@ -12,9 +12,12 @@
 #
 ##############################################################################
 from z3c.optionstorage.vocabulary import OptionStorageVocabulary
-from zope.app.schema.metaconfigure import vocabulary
+from zope.component.zcml import utility
+from zope.schema.interfaces import IVocabularyFactory
 
+
 def optionStorageVocabulary(_context, name):
     def factory(object, name=name):
         return OptionStorageVocabulary(object, name=name)
-    vocabulary(_context, name, factory)
+    directlyProvides(factory, IVocabularyFactory)
+    utility(_context, IVocabularyFactory, factory, name=name)