[Checkins] SVN: zope.app.content/trunk/ Replace zope.app.component dependency with zope.componentvocabulary.

[Gediminas Paulauskas]

Log message for revision 116680:
  Replace zope.app.component dependency with zope.componentvocabulary.
  Add missing zope.security dependency.
  

Changed:
  U   zope.app.content/trunk/CHANGES.txt
  U   zope.app.content/trunk/setup.py
  U   zope.app.content/trunk/src/zope/app/content/__init__.py

-=-
Modified: zope.app.content/trunk/CHANGES.txt
===================================================================
--- zope.app.content/trunk/CHANGES.txt	2010-09-20 18:52:14 UTC (rev 116679)
+++ zope.app.content/trunk/CHANGES.txt	2010-09-20 19:11:46 UTC (rev 116680)
@@ -5,7 +5,7 @@
 3.5.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Replace ``zope.app.component`` dependency with ``zope.componentvocabulary``.
 
 
 3.5.0 (2010-09-20)

Modified: zope.app.content/trunk/setup.py
===================================================================
--- zope.app.content/trunk/setup.py	2010-09-20 18:52:14 UTC (rev 116679)
+++ zope.app.content/trunk/setup.py	2010-09-20 19:11:46 UTC (rev 116680)
@@ -53,9 +53,10 @@
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
       install_requires=['setuptools',
-                        'zope.app.component',
+                        'zope.componentvocabulary',
                         'zope.interface',
                         'zope.schema',
+                        'zope.security',
                         ],
       extras_require=dict(test=[
           'zope.testing',

Modified: zope.app.content/trunk/src/zope/app/content/__init__.py
===================================================================
--- zope.app.content/trunk/src/zope/app/content/__init__.py	2010-09-20 18:52:14 UTC (rev 116679)
+++ zope.app.content/trunk/src/zope/app/content/__init__.py	2010-09-20 19:11:46 UTC (rev 116680)
@@ -14,11 +14,11 @@
 """Content Type convenience lookup functions."""
 
 from zope.interface import classProvides
+from zope.interface import providedBy
 from zope.schema.interfaces import IVocabularyFactory
 from zope.app.content.interfaces import IContentType
-from zope.app.component.vocabulary import UtilityVocabulary
+from zope.componentvocabulary.vocabulary import UtilityVocabulary
 from zope.security.proxy import removeSecurityProxy
-from zope.interface.declarations import providedBy
 
 
 def queryType(object, interface):