[z3-checkins] r21859 - in z3/sqlos/branch/jinty-utilities/src/sqlos: . ftests

[jinty at codespeak.net]

Author: jinty
Date: Tue Jan 10 02:20:33 2006
New Revision: 21859

Modified:
   z3/sqlos/branch/jinty-utilities/src/sqlos/container.py
   z3/sqlos/branch/jinty-utilities/src/sqlos/ftests/containers.txt
   z3/sqlos/branch/jinty-utilities/src/sqlos/ftests/isolated_containers.txt
Log:
Deprecate allowedFactories and convert the last in-tree users.

Modified: z3/sqlos/branch/jinty-utilities/src/sqlos/container.py
==============================================================================
--- z3/sqlos/branch/jinty-utilities/src/sqlos/container.py	(original)
+++ z3/sqlos/branch/jinty-utilities/src/sqlos/container.py	Tue Jan 10 02:20:33 2006
@@ -16,6 +16,7 @@
 from persistent import Persistent
 from zope.interface import implements
 from zope.component import IFactory
+from zope import deprecation
 from zope.app import zapi
 from zope.app.container.interfaces import IContained
 from zope.app.container.contained import ContainedProxy
@@ -83,10 +84,13 @@
     def __init__(self):
         pass
 
-    def allowedFactories(self):
+    def _allowedFactories(self):
         for name, factory in zapi.getFactoriesFor(ISQLObject, context=self):
             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 zapi.getFactoriesFor(ISQLObject, context=self):
@@ -200,11 +204,14 @@
 
     def allowedFactories(self):
         # Ignore all factories not implementing ISQLObjectIsolated
-        for f in SQLObjectContainer.allowedFactories(self):
+        for f in SQLObjectContainer._allowedFactories(self):
             implemented = zapi.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):

Modified: z3/sqlos/branch/jinty-utilities/src/sqlos/ftests/containers.txt
==============================================================================
--- z3/sqlos/branch/jinty-utilities/src/sqlos/ftests/containers.txt	(original)
+++ z3/sqlos/branch/jinty-utilities/src/sqlos/ftests/containers.txt	Tue Jan 10 02:20:33 2006
@@ -18,7 +18,8 @@
 
 In the ftesting.zcml a SamplePerson factory should be registered:
 
-    >>> u'sqlos.somename.SamplePerson' in container.allowedFactories()
+    >>> utilities = [i for i, j in container._getAllowedIISQLObjectUtilities()]
+    >>> u'sqlos.somename.SamplePerson' in utilities
     True
 
 So let's create some database tables if not already there:

Modified: z3/sqlos/branch/jinty-utilities/src/sqlos/ftests/isolated_containers.txt
==============================================================================
--- z3/sqlos/branch/jinty-utilities/src/sqlos/ftests/isolated_containers.txt	(original)
+++ z3/sqlos/branch/jinty-utilities/src/sqlos/ftests/isolated_containers.txt	Tue Jan 10 02:20:33 2006
@@ -18,7 +18,8 @@
 
 In the ftesting.zcml a SampleIsolatedPerson factory should be registered:
 
-    >>> u'SampleIsolatedPerson' in container.allowedFactories()
+    >>> utilities = [i for i, j in container._getAllowedIISQLObjectUtilities()]
+    >>> u'SampleIsolatedPerson' in utilities
     True
 
 So let's create some database tables if not already there: