[Zope-Checkins] CVS: Zope3/lib/python/Zope/ComponentArchitecture - GlobalResourceService.py:1.1.2.2.4.2 GlobalSkinService.py:1.1.2.1.8.1 GlobalViewService.py:1.1.2.2.4.2

Jim Fulton jim@zope.com
Mon, 3 Jun 2002 14:25:41 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/ComponentArchitecture
In directory cvs.zope.org:/tmp/cvs-serv14482/lib/python/Zope/ComponentArchitecture

Modified Files:
      Tag: Zope3InWonderland-branch
	GlobalResourceService.py GlobalSkinService.py 
	GlobalViewService.py 
Log Message:
Changed list attribute syntax to be more XML standard.
In particular, list attributes now expect items to be separated by
whitespace, rather than commas.


=== Zope3/lib/python/Zope/ComponentArchitecture/GlobalResourceService.py 1.1.2.2.4.1 => 1.1.2.2.4.2 ===
 class IGlobalResourceService(IResourceService):
 
-    def provideResource(name, type, factory, layer=''):
+    def provideResource(name, type, factory, layer='default'):
         """Provide a resource
 
         A resource is an inependent component that provides a view
@@ -82,7 +82,7 @@
         return default
         
         
-    def provideResource(self, name, type, factory, layer=''):
+    def provideResource(self, name, type, factory, layer='default'):
         '''See interface IGlobalResourceService'''
 
         resources = self.__layers.get(layer)


=== Zope3/lib/python/Zope/ComponentArchitecture/GlobalSkinService.py 1.1.2.1 => 1.1.2.1.8.1 ===
         """
 
-_default = ('',)
+_default = ('default',)
 
 class GlobalSkinService:
 
@@ -61,9 +61,8 @@
             layers = reg.getForObject(clean_object, view_type)
             if layers is not None:
                 return layers
-        if not name:
-            return _default
-        return ('',)
+
+        return _default
 
     _clear = __init__
     


=== Zope3/lib/python/Zope/ComponentArchitecture/GlobalViewService.py 1.1.2.2.4.1 => 1.1.2.2.4.2 ===
         '''
         
-    def provideView(forInterface, name, type, factory, layer=''):
+    def provideView(forInterface, name, type, factory, layer='default'):
         """Register a view factory
 
         The factory is a sequence. The last object in the sequence
@@ -124,7 +124,7 @@
         return default
         
         
-    def provideView(self, forInterface, name, type, maker, layer=''):
+    def provideView(self, forInterface, name, type, maker, layer='default'):
         '''See interface IGlobalViewService'''
 
         views = self.__layers.get(layer)