[Zope3-checkins] CVS: Zope3/src/zope/app/component - contentdirective.py:1.8.2.1 globalinterfaceservice.py:1.15.2.2 hooks.py:1.9.20.1 metaconfigure.py:1.17.2.1

[Sidnei da Silva]

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

Modified Files:
      Tag: dreamcatcher-ttwschema-branch
	contentdirective.py globalinterfaceservice.py hooks.py 
	metaconfigure.py 
Log Message:
__name__-geddon. Use getName for getting the name of interfaces

=== Zope3/src/zope/app/component/contentdirective.py 1.8 => 1.8.2.1 ===
--- Zope3/src/zope/app/component/contentdirective.py:1.8	Tue Aug  5 10:24:53 2003
+++ Zope3/src/zope/app/component/contentdirective.py	Wed Aug 13 09:36:13 2003
@@ -75,7 +75,7 @@
                 args = (Interfaces, 'provideInterface',
                         interface.__module__+
                         '.'+
-                        interface.__name__,
+                        interface.getName(),
                         interface)
                 )
 
@@ -126,7 +126,7 @@
             discriminator = None,
             callable = handler,
             args = (Interfaces, 'provideInterface',
-                    interface.__module__+ '.'+ interface.__name__,
+                    interface.__module__+ '.'+ interface.getName(),
                     interface)
             )
 
@@ -167,7 +167,7 @@
             discriminator = None,
             callable = handler,
             args = (Interfaces, 'provideInterface',
-                    schema.__module__+ '.'+ schema.__name__,
+                    schema.__module__+ '.'+ schema.getName(),
                     schema)
             )
 


=== Zope3/src/zope/app/component/globalinterfaceservice.py 1.15.2.1 => 1.15.2.2 ===
--- Zope3/src/zope/app/component/globalinterfaceservice.py:1.15.2.1	Tue Aug 12 09:19:16 2003
+++ Zope3/src/zope/app/component/globalinterfaceservice.py	Wed Aug 13 09:36:13 2003
@@ -74,7 +74,7 @@
             yield id, interface
 
     def _getAllDocs(self,interface):
-        docs = [str(interface.__name__).lower(),
+        docs = [str(interface.getName()).lower(),
                 str(interface.__doc__).lower()]
 
         for name in interface:
@@ -96,7 +96,7 @@
 
     def provideInterface(self, id, interface):
         if not id:
-            id = "%s.%s" % (interface.__module__, interface.__name__)
+            id = "%s.%s" % (interface.__module__, interface.getName())
 
         self.__data[id]=(interface, self._getAllDocs(interface))
 


=== Zope3/src/zope/app/component/hooks.py 1.9 => 1.9.20.1 ===
--- Zope3/src/zope/app/component/hooks.py:1.9	Sun Jun  1 11:59:29 2003
+++ Zope3/src/zope/app/component/hooks.py	Wed Aug 13 09:36:13 2003
@@ -137,7 +137,7 @@
 ##                                context.__class__.__module__,
 ##                                context.__class__.__name__,
 ##                                interface.__module__,
-##                                interface.__name__,
+##                                interface.getName(),
 ##                                ))
     if wrapped:
         data = getWrapperData(context, create=True)


=== Zope3/src/zope/app/component/metaconfigure.py 1.17 => 1.17.2.1 ===
--- Zope3/src/zope/app/component/metaconfigure.py:1.17	Mon Aug  4 11:37:46 2003
+++ Zope3/src/zope/app/component/metaconfigure.py	Wed Aug 13 09:36:13 2003
@@ -111,7 +111,7 @@
         discriminator = None,
         callable = handler,
         args = (Interfaces, 'provideInterface',
-                provides.__module__+'.'+provides.__name__, provides)
+                provides.__module__+'.'+provides.getName(), provides)
         )
 
 def factory(_context, component, id=None, permission=None):
@@ -188,7 +188,7 @@
         discriminator = None,
         callable = handler,
         args = (Interfaces, 'provideInterface',
-                type.__module__+'.'+type.__name__, type)
+                type.__module__+'.'+type.getName(), type)
         )
 
 def view(_context, factory, type, name, for_, layer='default',
@@ -227,7 +227,7 @@
         discriminator = None,
         callable = handler,
         args = (Interfaces, 'provideInterface',
-                type.__module__+'.'+type.__name__, type)
+                type.__module__+'.'+type.getName(), type)
         )
 
     if for_ is not None:
@@ -235,7 +235,7 @@
             discriminator = None,
             callable = handler,
             args = (Interfaces, 'provideInterface',
-                    for_.__module__+'.'+for_.__name__,
+                    for_.__module__+'.'+for_.getName(),
                     for_)
             )
 
@@ -256,7 +256,7 @@
         discriminator = None,
         callable = handler,
         args = (Interfaces, 'provideInterface',
-                type.__module__+'.'+type.__name__, type)
+                type.__module__+'.'+type.getName(), type)
         )
 
     if for_ is not None:
@@ -264,7 +264,7 @@
             discriminator = None,
             callable = handler,
             args = (Interfaces, 'provideInterface',
-                    for_.__module__+'.'+for_.__name__, for_)
+                    for_.__module__+'.'+for_.getName(), for_)
             )
 
 def serviceType(_context, id, interface):
@@ -276,7 +276,7 @@
     _context.action(
         discriminator = None,
         callable = provideInterface,
-        args = (interface.__module__+'.'+interface.__name__,
+        args = (interface.__module__+'.'+interface.getName(),
                 interface)
         )
 
@@ -334,7 +334,7 @@
         discriminator = None,
         callable = handler,
         args = (Interfaces, 'provideInterface',
-                type.__module__+'.'+type.__name__, type)
+                type.__module__+'.'+type.getName(), type)
         )
 
 #XXX you will be terminated soon