[z3-checkins] r26101 - z3/sqlos/trunk/src/sqlos

[jinty at codespeak.net]

Author: jinty
Date: Fri Apr 21 15:28:44 2006
New Revision: 26101

Modified:
   z3/sqlos/trunk/src/sqlos/container.py
Log:
Remove the deprecated allowedFactories method.

Modified: z3/sqlos/trunk/src/sqlos/container.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/container.py	(original)
+++ z3/sqlos/trunk/src/sqlos/container.py	Fri Apr 21 15:28:44 2006
@@ -17,7 +17,6 @@
 from persistent import Persistent
 from zope.interface import implements
 from zope.component import IFactory
-from zope import deprecation
 import zope.component
 from zope.app.container.interfaces import IContained
 from zope.app.container.contained import ContainedProxy
@@ -86,14 +85,6 @@
     def __init__(self):
         pass
 
-    def _allowedFactories(self):
-        for name, factory in zope.component.getFactoriesFor(ISQLObject):
-            if checkFactory(self, None, factory):
-                yield name
-    allowedFactories = deprecation.deprecated(_allowedFactories,
-            'allowedFactories is deprecated and will be removed after sqlos 0.2'
-            ' please use _getAllowedIISQLObjectUtilities instead.')
-
     def _getAllowedIISQLObjectUtilities(self):
         for name, factory in zope.component.getFactoriesFor(ISQLObject):
             if checkFactory(self, None, factory):
@@ -209,16 +200,6 @@
 
     _container_id = None
 
-    def allowedFactories(self):
-        # Ignore all factories not implementing ISQLObjectIsolated
-        for f in SQLObjectContainer._allowedFactories(self):
-            implemented = zope.component.getFactoryInterfaces(f)
-            if implemented.isOrExtends(ISQLObjectIsolated):
-                yield f
-    allowedFactories = deprecation.deprecated(allowedFactories,
-            'allowedFactories is deprecated and will be removed after sqlos 0.2'
-            ' please use _getAllowedIISQLObjectUtilities instead.')
-
     def _getAllowedIISQLObjectUtilities(self):
         # Ignore all utilities not implementing ISQLObjectIsolated
         for name, utility in SQLObjectContainer._getAllowedIISQLObjectUtilities(self):