[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog - __init__.py:1.18

[Casey Duncan]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog
In directory cvs.zope.org:/tmp/cvs-serv30283/lib/python/Products/ZCatalog

Modified Files:
	__init__.py 
Log Message:
Merge ZClass constructor spruce up changes


=== Zope/lib/python/Products/ZCatalog/__init__.py 1.17 => 1.18 ===
 """ZCatalog product"""
 
-import ZCatalog, Catalog, CatalogAwareness,  ZClasses
+import ZCatalog, Catalog, CatalogPathAwareness,  ZClasses
 from Products.PluginIndexes.TextIndex import Vocabulary
 from ZClasses import createZClassForBase
 
 createZClassForBase( ZCatalog.ZCatalog , globals()
                    , 'ZCatalogBase', 'ZCatalog' )
-createZClassForBase( CatalogAwareness.CatalogAware, globals()
+createZClassForBase( CatalogPathAwareness.CatalogAware, globals()
                    , 'CatalogAwareBase', 'CatalogAware' )
 
 def initialize(context):