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

[Jeremy Hylton]

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

Modified Files:
      Tag: Zope-2_6-branch
	__init__.py 
Log Message:
Make sure App.Product is imported first, so that test.py can work.

This change does not affect the old utilities/testrunner.py.


=== Zope/lib/python/Products/ZCatalog/__init__.py 1.20 => 1.20.6.1 ===
--- Zope/lib/python/Products/ZCatalog/__init__.py:1.20	Wed Aug 14 18:25:15 2002
+++ Zope/lib/python/Products/ZCatalog/__init__.py	Tue Mar  9 15:52:34 2004
@@ -13,6 +13,14 @@
 
 """ZCatalog product"""
 
+# There are a set of circular imports involving (at least) App.Product
+# and ZClasses.  If ZClasses is imported first, things break.  If
+# App.Product is imported first, the imports appear to work.  There are
+# probably many places where this could be a problem.  This particular
+# import was added so that tests could be run using Zope 2.7's test.py.
+
+import App.Product
+
 import ZCatalog, Catalog, CatalogAwareness, CatalogPathAwareness, ZClasses
 from Products.PluginIndexes.TextIndex import Vocabulary
 from ZClasses import createZClassForBase