[Checkins] SVN: grokcore.catalog/trunk/s Corrected imports

[Souheil Chelfouh]

Log message for revision 125355:
  Corrected imports
  

Changed:
  U   grokcore.catalog/trunk/setup.py
  U   grokcore.catalog/trunk/src/grokcore/catalog/components.py
  U   grokcore.catalog/trunk/src/grokcore/catalog/index.py

-=-
Modified: grokcore.catalog/trunk/setup.py
===================================================================
--- grokcore.catalog/trunk/setup.py	2012-04-27 16:32:45 UTC (rev 125354)
+++ grokcore.catalog/trunk/setup.py	2012-04-27 16:32:57 UTC (rev 125355)
@@ -29,23 +29,27 @@
     description='Grok-like configuration for catalog and indexes',
     long_description=long_description,
     license='ZPL',
-    classifiers=['Environment :: Web Environment',
-                 'Intended Audience :: Developers',
-                 'License :: OSI Approved :: Zope Public License',
-                 'Programming Language :: Python',
-                 'Framework :: Zope3',
-                 ],
-
+    classifiers=[
+        'Environment :: Web Environment',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Zope Public License',
+        'Programming Language :: Python',
+        'Framework :: Zope3',
+        ],
     packages=find_packages('src'),
     package_dir={'': 'src'},
     namespace_packages=['grokcore'],
     include_package_data=True,
     zip_safe=False,
-    install_requires=['setuptools',
-                      'grokcore.component >= 2.1',
-                      'martian >= 0.13',
-                      'grokcore.site',
-                      ],
+    install_requires=[
+        'setuptools',
+        'grokcore.component >= 2.1',
+        'martian >= 0.13',
+        'grokcore.site',
+        'zc.catalog',
+        'zope.catalog',
+        'zope.interface',
+        ],
     tests_require=tests_require,
     extras_require={'test': tests_require},
 )

Modified: grokcore.catalog/trunk/src/grokcore/catalog/components.py
===================================================================
--- grokcore.catalog/trunk/src/grokcore/catalog/components.py	2012-04-27 16:32:45 UTC (rev 125354)
+++ grokcore.catalog/trunk/src/grokcore/catalog/components.py	2012-04-27 16:32:57 UTC (rev 125355)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import martian.util
-from grokcore.catalog.interfaces.IIndexDefinition
+from grokcore.catalog.interfaces import IIndexDefinition
 
 
 class IndexesClass(object):
@@ -63,7 +63,7 @@
             if '.' in name:
                 setattr(self, name, value)
                 continue
-            if not interfaces.IIndexDefinition.providedBy(value):
+            if not IIndexDefinition.providedBy(value):
                 continue
             indexes[name] = value
         self.__grok_indexes__ = indexes

Modified: grokcore.catalog/trunk/src/grokcore/catalog/index.py
===================================================================
--- grokcore.catalog/trunk/src/grokcore/catalog/index.py	2012-04-27 16:32:45 UTC (rev 125354)
+++ grokcore.catalog/trunk/src/grokcore/catalog/index.py	2012-04-27 16:32:57 UTC (rev 125355)
@@ -25,7 +25,7 @@
 from martian.error import GrokError, GrokImportError
 from martian.util import frame_is_class
 
-from grokcore..interfaces import IIndexDefinition
+from grokcore.catalog.interfaces import IIndexDefinition
 
 
 class IndexDefinition(object):