[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Folder - FolderAdder.py:1.1.2.2

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Folder
In directory cvs.zope.org:/tmp/cvs-serv13351/Folder

Modified Files:
      Tag: Zope-3x-branch
	FolderAdder.py 
Log Message:
Refactored addable registry and added separate content and service addables

=== Zope3/lib/python/Zope/App/OFS/Folder/FolderAdder.py 1.1.2.1 => 1.1.2.2 ===
 from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
 from Zope.PageTemplate.PageTemplateFile import PageTemplateFile
-from Zope.App.ZMI.Addable import getAddables
+from Zope.App.ZMI.Addable import ContentAddables
 from Zope.ComponentArchitecture import createObject
 
 class FolderAdderError( Exception ):
@@ -48,7 +48,7 @@
             Return a sequence of mappings for the addables for our
             folder.
         """
-        return map( self._extractAdderInfo, getAddables( self._folder ) )
+        return map( self._extractAdderInfo, ContentAddables.getAddables( self._folder ) )
 
 
     def action( self, id, type_name, REQUEST=None):