[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/intid/ Since the BTree factory lookup uses queryUtility with a sensible default,

[Albertas Agejevas]

Log message for revision 72305:
  Since the BTree factory lookup uses queryUtility with a sensible default,
  the default factories are not needed.
  

Changed:
  U   Zope3/trunk/src/zope/app/intid/__init__.py
  U   Zope3/trunk/src/zope/app/intid/configure.zcml
  U   Zope3/trunk/src/zope/app/intid/tests.py

-=-
Modified: Zope3/trunk/src/zope/app/intid/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/intid/__init__.py	2007-02-01 18:09:08 UTC (rev 72304)
+++ Zope3/trunk/src/zope/app/intid/__init__.py	2007-02-01 18:38:00 UTC (rev 72305)
@@ -32,7 +32,6 @@
 from zope.component import adapter, getAllUtilitiesRegisteredFor, queryUtility
 from zope.component.interfaces import IFactory
 
-from zope.component.factory import Factory
 from zope.app.container.interfaces import IObjectRemovedEvent
 from zope.app.container.interfaces import IObjectAddedEvent
 from zope.app.container.contained import Contained
@@ -171,9 +170,3 @@
             # Notify the catalogs that this object was added.
             notify(IntIdAddedEvent(ob, event))
 
-
-#
-# Hooks for changing the flavour of BTrees IntIds utility uses
-#
-IOBTreeFactory = Factory(IOBTree.IOBTree)
-OIBTreeFactory = Factory(OIBTree.OIBTree)

Modified: Zope3/trunk/src/zope/app/intid/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/intid/configure.zcml	2007-02-01 18:09:08 UTC (rev 72304)
+++ Zope3/trunk/src/zope/app/intid/configure.zcml	2007-02-01 18:38:00 UTC (rev 72305)
@@ -32,9 +32,6 @@
   <subscriber handler=".removeIntIdSubscriber" />
   <subscriber handler=".addIntIdSubscriber" />
 
-  <utility component=".IOBTreeFactory" name="IOBTree" />
-  <utility component=".OIBTreeFactory" name="OIBTree" />
-
   <!-- Views -->
   <include package=".browser" />
 

Modified: Zope3/trunk/src/zope/app/intid/tests.py
===================================================================
--- Zope3/trunk/src/zope/app/intid/tests.py	2007-02-01 18:09:08 UTC (rev 72304)
+++ Zope3/trunk/src/zope/app/intid/tests.py	2007-02-01 18:38:00 UTC (rev 72305)
@@ -32,7 +32,7 @@
 from zope.app.component.hooks import setSite
 
 from zope.app.intid.interfaces import IIntIds
-from zope.app.intid import IntIds, IOBTreeFactory, OIBTreeFactory
+from zope.app.intid import IntIds
 from zope.app.keyreference.persistent import KeyReferenceToPersistent
 from zope.app.keyreference.persistent import connectionOfPersistent
 from zope.app.keyreference.interfaces import IKeyReference