[Zope3-checkins] CVS: Zope3/src/zope/app/contentdirective - contentdirective.py:1.5.2.1

[Sidnei da Silva]

Update of /cvs-repository/Zope3/src/zope/app/contentdirective
In directory cvs.zope.org:/tmp/cvs-serv18615/src/zope/app/contentdirective

Modified Files:
      Tag: paris-copypasterename-branch
	contentdirective.py 
Log Message:
Updating from HEAD to make sure everything still works before merging

=== Zope3/src/zope/app/contentdirective/contentdirective.py 1.5 => 1.5.2.1 ===
--- Zope3/src/zope/app/contentdirective/contentdirective.py:1.5	Tue Jan 21 16:35:22 2003
+++ Zope3/src/zope/app/contentdirective/contentdirective.py	Tue Feb 11 09:41:13 2003
@@ -20,6 +20,7 @@
 from zope.configuration.interfaces import INonEmptyDirective
 from zope.configuration.interfaces import ISubdirectiveHandler
 from zope.component import getService
+from zope.component.servicenames import Interfaces, Factories
 from zope.configuration.exceptions import ConfigurationError
 from zope.configuration.action import Action
 from zope.app.component.classfactory import ClassFactory
@@ -73,7 +74,7 @@
             Action(
                discriminator = None,
                callable = handler,
-               args = ('Interfaces', 'provideInterface',
+               args = (Interfaces, 'provideInterface',
                        resolved_interface.__module__+
                        '.'+
                        resolved_interface.__name__,
@@ -207,4 +208,4 @@
                                NamesChecker(('getInterfaces',),
                                             __call__=permission))
 
-    getService(None, 'Factories').provideFactory(id, factory)
+    getService(None, Factories).provideFactory(id, factory)