[Checkins] SVN: zope.componentvocabulary/trunk/src/zope/componentvocabulary/ no need to include zope.component's configure.zcml, include its meta.zcml directly instead (also fixes the configuration test when running with zope.component <3.10.0)

[Thomas Lotze]

Log message for revision 118811:
  no need to include zope.component's configure.zcml, include its meta.zcml directly instead (also fixes the configuration test when running with zope.component <3.10.0)

Changed:
  U   zope.componentvocabulary/trunk/src/zope/componentvocabulary/configure.zcml
  U   zope.componentvocabulary/trunk/src/zope/componentvocabulary/tests/test_configure.py

-=-
Modified: zope.componentvocabulary/trunk/src/zope/componentvocabulary/configure.zcml
===================================================================
--- zope.componentvocabulary/trunk/src/zope/componentvocabulary/configure.zcml	2010-12-11 21:06:17 UTC (rev 118810)
+++ zope.componentvocabulary/trunk/src/zope/componentvocabulary/configure.zcml	2010-12-11 23:12:03 UTC (rev 118811)
@@ -1,6 +1,6 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <include package="zope.component" file="configure.zcml" />
+  <include package="zope.component" file="meta.zcml" />
 
   <interface
       interface="zope.interface.interfaces.IInterface"

Modified: zope.componentvocabulary/trunk/src/zope/componentvocabulary/tests/test_configure.py
===================================================================
--- zope.componentvocabulary/trunk/src/zope/componentvocabulary/tests/test_configure.py	2010-12-11 21:06:17 UTC (rev 118810)
+++ zope.componentvocabulary/trunk/src/zope/componentvocabulary/tests/test_configure.py	2010-12-11 23:12:03 UTC (rev 118811)
@@ -31,4 +31,4 @@
         count = len(list(gsm.registeredUtilities()))
         zope.configuration.xmlconfig.XMLConfig(
             'configure.zcml', zope.componentvocabulary)()
-        self.assertEqual(count + 11, len(list(gsm.registeredUtilities())))
+        self.assertEqual(count + 5, len(list(gsm.registeredUtilities())))