[Zope-Checkins] CVS: Zope3/lib/python/Zope/ComponentArchitecture - GlobalResourceService.py:1.3 GlobalViewService.py:1.4 __init__.py:1.4

[Jim Fulton]

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

Modified Files:
	GlobalResourceService.py GlobalViewService.py __init__.py 
Log Message:
Fixed a bunch of bugs that prevented custom add views from working.



=== Zope3/lib/python/Zope/ComponentArchitecture/GlobalResourceService.py 1.2 => 1.3 ===
 from IToIRegistry import DataRegistry
 from Exceptions import ComponentLookupError
-from Zope.ComponentArchitecture import getSkin, _marker
+from Zope.ComponentArchitecture import getSkin
 from IResourceService import IResourceService
 
 class IGlobalResourceService(IResourceService):


=== Zope3/lib/python/Zope/ComponentArchitecture/GlobalViewService.py 1.3 => 1.4 ===
 from IToIRegistry import IToIRegistry, IToIDataRegistry
 from Exceptions import ComponentLookupError
-from Zope.ComponentArchitecture import getSkin, _marker
+from Zope.ComponentArchitecture import getSkin
 from IViewService import IViewService
 from Zope.Exceptions import NotFoundError
 from Zope.Proxy.ProxyIntrospection import removeAllProxies


=== Zope3/lib/python/Zope/ComponentArchitecture/__init__.py 1.3 => 1.4 ===
 
 
-_marker = object() # this exact marker is used throughout CA
-
 # placeful component architecture functions
 
 # basic service manager tools
@@ -74,7 +72,7 @@
     return getService(context, 'Adapters').getAdapter(
         object, interface)
 
-def queryAdapter(object, interface, default=_marker, context=None):
+def queryAdapter(object, interface, default=None, context=None):
     if context is None:
         context = object
     return getService(context, 'Adapters').queryAdapter(