[Zope3-checkins] CVS: Zope3/src/zope/app/catalog - catalog.py:1.8

[Anthony Baxter]

Update of /cvs-repository/Zope3/src/zope/app/catalog
In directory cvs.zope.org:/tmp/cvs-serv25027

Modified Files:
	catalog.py 
Log Message:
move catalog guts into CatalogBase class. This way Content-space Catalogs 
can get stuff that won't end up in the utility space (Jim wants to add a
'pages' folder to the Content-space Catalogs).


=== Zope3/src/zope/app/catalog/catalog.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/catalog/catalog.py:1.7	Mon Jul 14 04:31:04 2003
+++ Zope3/src/zope/app/catalog/catalog.py	Mon Jul 14 04:33:39 2003
@@ -42,7 +42,7 @@
             yield obj
 
 
-class Catalog(Persistent, SampleContainer):
+class CatalogBase(Persistent, SampleContainer):
 
     implements(ICatalog, ISubscriber, IDeleteNotifiable, 
                IAddNotifiable, IContainer, IAttributeAnnotatable)
@@ -143,6 +143,10 @@
         return results
     searchResults = ContextMethod(searchResults)
 
-class CatalogUtility(Catalog):
+class CatalogUtility(CatalogBase):
+    "A Catalog in service-space"
     implements (ILocalUtility)
 
+class Catalog(CatalogBase): 
+    "A content-space Catalog"
+    pass