[Zope3-checkins] CVS: Zope/lib/python/ZConfig - schema.py:1.20.22.5

[Fred Drake]

Update of /cvs-repository/Zope/lib/python/ZConfig
In directory cvs.zope.org:/tmp/cvs-serv26682

Modified Files:
      Tag: Zope-2_7-branch
	schema.py 
Log Message:
Repeated imports failed; fixed and added tests.


=== Zope/lib/python/ZConfig/schema.py 1.20.22.4 => 1.20.22.5 ===
--- Zope/lib/python/ZConfig/schema.py:1.20.22.4	Tue Oct  7 15:36:21 2003
+++ Zope/lib/python/ZConfig/schema.py	Wed Oct 22 17:39:18 2003
@@ -303,8 +303,8 @@
         else:
             if os.path.dirname(file):
                 self.error("file may not include a directory part")
-            if not self._schema.hasComponent(pkg):
-                src = self._loader.schemaComponentSource(pkg, file)
+            src = self._loader.schemaComponentSource(pkg, file)
+            if not self._schema.hasComponent(src):
                 self._schema.addComponent(src)
                 self.loadComponent(src)