[Checkins] SVN: zope.app.cache/trunk/ Use zope.componentvocabulary instead of zope.app.component.

[Hanno Schlichting]

Log message for revision 100472:
  Use zope.componentvocabulary instead of zope.app.component.
  

Changed:
  U   zope.app.cache/trunk/CHANGES.txt
  U   zope.app.cache/trunk/setup.py
  D   zope.app.cache/trunk/src/zope/app/cache/DEPENDENCIES.cfg
  D   zope.app.cache/trunk/src/zope/app/cache/SETUP.cfg
  U   zope.app.cache/trunk/src/zope/app/cache/__init__.py
  U   zope.app.cache/trunk/src/zope/app/cache/browser/__init__.py
  D   zope.app.cache/trunk/src/zope/app/cache/cache-configure.zcml
  U   zope.app.cache/trunk/src/zope/app/cache/caching.py
  U   zope.app.cache/trunk/src/zope/app/cache/tests/__init__.py

-=-
Modified: zope.app.cache/trunk/CHANGES.txt
===================================================================
--- zope.app.cache/trunk/CHANGES.txt	2009-05-27 16:05:07 UTC (rev 100471)
+++ zope.app.cache/trunk/CHANGES.txt	2009-05-27 16:09:26 UTC (rev 100472)
@@ -2,10 +2,10 @@
 CHANGES
 =======
 
-3.5.1 (unreleased)
+3.6.0 (unreleased)
 ------------------
 
-- ...
+- Use zope.componentvocabulary instead of zope.app.component.
 
 3.5.0 (2009-01-31)
 ------------------

Modified: zope.app.cache/trunk/setup.py
===================================================================
--- zope.app.cache/trunk/setup.py	2009-05-27 16:05:07 UTC (rev 100471)
+++ zope.app.cache/trunk/setup.py	2009-05-27 16:09:26 UTC (rev 100472)
@@ -24,7 +24,7 @@
 setup(name = 'zope.app.cache',
       version = '3.5.1dev',
       author='Zope Corporation and Contributors',
-      author_email='zope3-dev at zope.org',
+      author_email='zope-dev at zope.org',
       description='Zope Caching Framework',
       long_description=(
           read('README.txt')
@@ -42,7 +42,7 @@
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope3'],
-      url='http://cheeseshop.python.org/pypi/zope.app.cache',
+      url='http://pypi.python.org/pypi/zope.app.cache',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir = {'': 'src'},
@@ -52,10 +52,10 @@
           'setuptools',
           'ZODB3',
           'zope.annotation',
-          'zope.app.component',
           'zope.app.form',
           'zope.app.pagetemplate',
           'zope.component',
+          'zope.componentvocabulary',
           'zope.container',
           'zope.interface',
           'zope.proxy',

Deleted: zope.app.cache/trunk/src/zope/app/cache/DEPENDENCIES.cfg
===================================================================
--- zope.app.cache/trunk/src/zope/app/cache/DEPENDENCIES.cfg	2009-05-27 16:05:07 UTC (rev 100471)
+++ zope.app.cache/trunk/src/zope/app/cache/DEPENDENCIES.cfg	2009-05-27 16:09:26 UTC (rev 100472)
@@ -1,5 +0,0 @@
-persistent
-zope.app
-zope.component
-zope.interface
-zope.schema

Deleted: zope.app.cache/trunk/src/zope/app/cache/SETUP.cfg
===================================================================
--- zope.app.cache/trunk/src/zope/app/cache/SETUP.cfg	2009-05-27 16:05:07 UTC (rev 100471)
+++ zope.app.cache/trunk/src/zope/app/cache/SETUP.cfg	2009-05-27 16:09:26 UTC (rev 100472)
@@ -1,5 +0,0 @@
-# Tell zpkg how to install the ZCML slugs.
-
-<data-files zopeskel/etc/package-includes>
-  cache-*.zcml
-</data-files>

Modified: zope.app.cache/trunk/src/zope/app/cache/__init__.py
===================================================================
--- zope.app.cache/trunk/src/zope/app/cache/__init__.py	2009-05-27 16:05:07 UTC (rev 100471)
+++ zope.app.cache/trunk/src/zope/app/cache/__init__.py	2009-05-27 16:09:26 UTC (rev 100472)
@@ -1,2 +1 @@
 #
-# This file is necessary to make this directory a package.

Modified: zope.app.cache/trunk/src/zope/app/cache/browser/__init__.py
===================================================================
--- zope.app.cache/trunk/src/zope/app/cache/browser/__init__.py	2009-05-27 16:05:07 UTC (rev 100471)
+++ zope.app.cache/trunk/src/zope/app/cache/browser/__init__.py	2009-05-27 16:09:26 UTC (rev 100472)
@@ -1,2 +1 @@
 #
-# This file is necessary to make this directory a package.

Deleted: zope.app.cache/trunk/src/zope/app/cache/cache-configure.zcml
===================================================================
--- zope.app.cache/trunk/src/zope/app/cache/cache-configure.zcml	2009-05-27 16:05:07 UTC (rev 100471)
+++ zope.app.cache/trunk/src/zope/app/cache/cache-configure.zcml	2009-05-27 16:09:26 UTC (rev 100472)
@@ -1 +0,0 @@
-<include package="zope.app.cache" />

Modified: zope.app.cache/trunk/src/zope/app/cache/caching.py
===================================================================
--- zope.app.cache/trunk/src/zope/app/cache/caching.py	2009-05-27 16:05:07 UTC (rev 100471)
+++ zope.app.cache/trunk/src/zope/app/cache/caching.py	2009-05-27 16:09:26 UTC (rev 100472)
@@ -19,9 +19,9 @@
 
 from zope.interface import classProvides
 from zope.component import ComponentLookupError, getUtility
+from zope.componentvocabulary.vocabulary import UtilityVocabulary
 from zope.schema.interfaces import IVocabularyFactory
 from zope.app.cache.interfaces import ICacheable, ICache
-from zope.app.component.vocabulary import UtilityVocabulary
 from zope.traversing.api import getPath
 
 def getCacheForObject(obj):

Modified: zope.app.cache/trunk/src/zope/app/cache/tests/__init__.py
===================================================================
--- zope.app.cache/trunk/src/zope/app/cache/tests/__init__.py	2009-05-27 16:05:07 UTC (rev 100471)
+++ zope.app.cache/trunk/src/zope/app/cache/tests/__init__.py	2009-05-27 16:09:26 UTC (rev 100472)
@@ -1,2 +1 @@
 #
-# This file is necessary to make this directory a package.