[Checkins] SVN: zc.form/trunk/ Depending on ``zope.catalog`` instead of ``zope.app.catalog``.

[Michael Howitz]

Log message for revision 122896:
  Depending on ``zope.catalog`` instead of ``zope.app.catalog``.
  

Changed:
  U   zc.form/trunk/CHANGES.txt
  U   zc.form/trunk/setup.py
  U   zc.form/trunk/src/zc/form/field.py

-=-
Modified: zc.form/trunk/CHANGES.txt
===================================================================
--- zc.form/trunk/CHANGES.txt	2011-09-22 15:06:54 UTC (rev 122895)
+++ zc.form/trunk/CHANGES.txt	2011-09-22 15:32:24 UTC (rev 122896)
@@ -7,6 +7,8 @@
 
 - Got rid of ``zope.app.zapi`` dependency.
 
+- Depending on ``zope.catalog`` instead of ``zope.app.catalog``.
+
 - Fixed tests to run with ``zope.schema`` >= 3.6.
 
 - Using Python's ``doctest`` module instead of depreacted

Modified: zc.form/trunk/setup.py
===================================================================
--- zc.form/trunk/setup.py	2011-09-22 15:06:54 UTC (rev 122895)
+++ zc.form/trunk/setup.py	2011-09-22 15:32:24 UTC (rev 122896)
@@ -30,7 +30,7 @@
         'ZODB3',
         'zope.annotation',
         'zope.app.principalannotation',
-        'zope.app.catalog',
+        'zope.catalog',
         'zope.app.form',
         'zope.app.pagetemplate',
         'zope.cachedescriptors',

Modified: zc.form/trunk/src/zc/form/field.py
===================================================================
--- zc.form/trunk/src/zc/form/field.py	2011-09-22 15:06:54 UTC (rev 122895)
+++ zc.form/trunk/src/zc/form/field.py	2011-09-22 15:32:24 UTC (rev 122896)
@@ -19,7 +19,7 @@
 from zope.schema.interfaces import (
     ValidationError, WrongType, IField, IVocabularyTokenized)
 from zope.interface.exceptions import DoesNotImplement
-import zope.app.catalog.interfaces
+import zope.catalog.interfaces
 import zope.index.text.queryparser
 import zope.index.text.parsetree
 
@@ -405,7 +405,7 @@
             index = self.index_getter(self.context)
         else:
             catalog = component.getUtility(
-                zope.app.catalog.interfaces.ICatalog,
+                zope.catalog.interfaces.ICatalog,
                 self.catalog_name,
                 field.context)
             index = catalog[self.index_name]