[Zope3-checkins] CVS: Zope3/src/zope/app/startup - bootstrap.py:1.7.2.2
Guido van Rossum
guido@python.org
Thu, 27 Feb 2003 20:43:30 -0500
Update of /cvs-repository/Zope3/src/zope/app/startup
In directory cvs.zope.org:/tmp/cvs-serv6783/src/zope/app/startup
Modified Files:
Tag: use-config-branch
bootstrap.py
Log Message:
Checkpoint commit on this branch -- something's still flakey, but I
can't figure out why and I may not get back to this until Monday.
Redid the __init__ of ServiceConfiguration and its ancestors to get
rid of the unnecessary *args / **kwds business, and added an optional
context argument. When context is given, it is used to traverse to
the service object and we ensure that it implements IUseConfigurable
and IService -- all configured services must implement these. When
context is not given, we don't perform this check -- this only happens
in the test suite.
Fixed various places that need to pass a context argument, and fixed
some services to implement the required interfaces.
=== Zope3/src/zope/app/startup/bootstrap.py 1.7.2.1 => 1.7.2.2 ===
--- Zope3/src/zope/app/startup/bootstrap.py:1.7.2.1 Tue Feb 25 16:38:23 2003
+++ Zope3/src/zope/app/startup/bootstrap.py Thu Feb 27 20:43:29 2003
@@ -119,7 +119,8 @@
package = traverse(root_folder, package_name)
configuration_manager = traverseName(package, 'configure')
configuration = ServiceConfiguration(service_type,
- package_name + (name,))
+ package_name + (name,),
+ root_folder)
cm = configuration_manager
if use_container:
cm = ZopeContainerAdapter(configuration_manager)