[Zope3-checkins] CVS: Zope3/src/zope/app/component - metaconfigure.py:1.6.2.1

[Sidnei da Silva]

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

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

=== Zope3/src/zope/app/component/metaconfigure.py 1.6 => 1.6.2.1 ===
--- Zope3/src/zope/app/component/metaconfigure.py:1.6	Mon Feb  3 13:22:08 2003
+++ Zope3/src/zope/app/component/metaconfigure.py	Tue Feb 11 09:41:10 2003
@@ -15,6 +15,8 @@
 from zope.configuration.exceptions import ConfigurationError
 from zope.security.proxy import Proxy
 from zope.component import getService, getServiceManager
+from zope.component.servicenames import Adapters, Interfaces, Skins
+from zope.component.servicenames import Views, ResourceService, Factories
 from zope.configuration import namespace
 from zope.interface import Interface
 from zope.configuration.action import Action
@@ -58,7 +60,7 @@
         Action(
           discriminator = None,
           callable = handler,
-          args = ('Interfaces', 'provideInterface', '', interface)
+          args = (Interfaces, 'provideInterface', '', interface)
         ),
       ]
 
@@ -85,13 +87,13 @@
         Action(
             discriminator = ('adapter', for_, provides, name),
             callable = checkingHandler,
-            args = (permission, 'Adapters', 'provideAdapter',
+            args = (permission, Adapters, 'provideAdapter',
                     for_, provides, factory, name),
                ),
         Action(
             discriminator = None,
             callable = handler,
-            args = ('Interfaces', 'provideInterface', '', provides)
+            args = (Interfaces, 'provideInterface', '', provides)
               )
               ]
     if for_ is not None:
@@ -100,7 +102,7 @@
         Action(
             discriminator = None,
             callable = handler,
-            args = ('Interfaces', 'provideInterface', '', for_)
+            args = (Interfaces, 'provideInterface', '', for_)
               )
          )
 
@@ -136,7 +138,7 @@
         Action(
             discriminator = None,
             callable = handler,
-            args = ('Interfaces', 'provideInterface',
+            args = (Interfaces, 'provideInterface',
                     provides.__module__+'.'+provides.__name__, provides)
               )
         ]
@@ -152,7 +154,7 @@
         Action(
             discriminator = ('factory', id),
             callable = handler,
-            args = ('Factories', 'provideFactory', id, component),
+            args = (Factories, 'provideFactory', id, component),
             )
         ]
 
@@ -204,13 +206,13 @@
         Action(
             discriminator = ('resource', name, type, layer),
             callable = checkingHandler,
-            args = (permission, 'Resources','provideResource',
+            args = (permission, ResourceService,'provideResource',
                     name, type, factory, layer),
             ),
         Action(
             discriminator = None,
             callable = handler,
-            args = ('Interfaces', 'provideInterface',
+            args = (Interfaces, 'provideInterface',
                     type.__module__+'.'+type.__name__, type)
               )
         ]
@@ -249,13 +251,13 @@
         Action(
             discriminator = ('view', for_, name, type, layer),
             callable = checkingHandler,
-            args = (permission, 'Views','provideView', for_, name,
+            args = (permission, Views,'provideView', for_, name,
                     type, factory, layer),
             ),
         Action(
             discriminator = None,
             callable = handler,
-            args = ('Interfaces', 'provideInterface',
+            args = (Interfaces, 'provideInterface',
                     type.__module__+'.'+type.__name__, type)
             )
             ]
@@ -265,7 +267,7 @@
         Action(
             discriminator = None,
             callable = handler,
-            args = ('Interfaces', 'provideInterface',
+            args = (Interfaces, 'provideInterface',
                     for_.__module__+'.'+for_.__name__,
                     for_)
               )
@@ -291,12 +293,12 @@
         Action(
         discriminator = ('defaultViewName', for_, type, name),
         callable = handler,
-        args = ('Views','setDefaultViewName', for_, type, name),
+        args = (Views,'setDefaultViewName', for_, type, name),
         ),
         Action(
             discriminator = None,
             callable = handler,
-            args = ('Interfaces', 'provideInterface',
+            args = (Interfaces, 'provideInterface',
                     type.__module__+'.'+type.__name__, type)
             )
                ]
@@ -306,7 +308,7 @@
         Action(
             discriminator = None,
             callable = handler,
-            args = ('Interfaces', 'provideInterface',
+            args = (Interfaces, 'provideInterface',
                     for_.__module__+'.'+for_.__name__, for_)
               )
          )
@@ -384,12 +386,12 @@
         Action(
             discriminator = ('skin', name, type),
             callable = handler,
-            args = ('Skins','defineSkin',name, type, layers)
+            args = (Skins,'defineSkin',name, type, layers)
               ),
         Action(
             discriminator = None,
             callable = handler,
-            args = ('Interfaces', 'provideInterface',
+            args = (Interfaces, 'provideInterface',
                     type.__module__+'.'+type.__name__, type)
               )
              ]