[Checkins]
SVN: zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py
whitespace
Christian Zagrodnick
cz at gocept.com
Thu Jun 21 03:48:37 EDT 2007
Log message for revision 76878:
whitespace
Changed:
U zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py
-=-
Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py 2007-06-21 07:32:19 UTC (rev 76877)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py 2007-06-21 07:48:36 UTC (rev 76878)
@@ -19,6 +19,8 @@
$Id$
"""
__docformat__ = 'restructuredtext'
+
+
import transaction
import logging
import warnings
@@ -37,6 +39,7 @@
from zope.app.publication.zopepublication import ZopePublication
from zope.app.appsetup import interfaces
+
def ensureObject(root_folder, object_name, object_type, object_factory,
asObject=False):
"""Check that there's a basic object in the site
@@ -46,7 +49,7 @@
"""
if not asObject:
warnings.warn("asObject=False is deprecated", DeprecationWarning, 2)
-
+
package = getSiteManagerDefault(root_folder)
valid_objects = [ name
for name in package
@@ -61,6 +64,7 @@
else:
return name
+
def ensureUtility(root_folder, interface, utility_type,
utility_factory, name='', asObject=False, **kw):
"""Add a utility to the top site manager
@@ -71,7 +75,7 @@
warnings.warn("asObject=False is deprecated and will not be "
"supported after Zope 3.5",
DeprecationWarning, 2)
-
+
sm = root_folder.getSiteManager()
utils = [reg for reg in sm.registeredUtilities()
if (reg.provided.isOrExtends(interface) and reg.name == name)]
@@ -83,6 +87,7 @@
else:
return None
+
def addConfigureUtility(
root_folder, interface, utility_type, utility_factory, name='',
asObject=False, **kw):
@@ -90,16 +95,17 @@
if not asObject:
warnings.warn("asObject=False is deprecated and will not be "
"supported after Zope 3.5", DeprecationWarning, 2)
-
+
utility = addUtility(root_folder, utility_type, utility_factory, True,
**kw)
root_folder.getSiteManager().registerUtility(utility, interface, name)
-
+
if asObject:
return utility
else:
return utility.__name__
+
def addUtility(root_folder, utility_type, utility_factory,
asObject=False, **kw):
""" Add a Utility to the root folder's site manager.
@@ -109,7 +115,7 @@
if not asObject:
warnings.warn("asObject=False is deprecated and will not be "
"supported after Zope 3.5", DeprecationWarning, 2)
-
+
package = getSiteManagerDefault(root_folder)
chooser = INameChooser(package)
utility = utility_factory()
@@ -129,6 +135,7 @@
else:
return name
+
@zope.deprecation.deprecate(
'configureUtility is deprecated and will be removed in Zope 3.5. '
'The registration APIs are simple enough now that this just makes things '
@@ -145,10 +152,12 @@
interface, name,
)
+
def getSiteManagerDefault(root_folder):
package = traverse(root_folder.getSiteManager(), 'default')
return package
+
def getInformationFromEvent(event):
""" Extracts information from the event
@@ -194,6 +203,7 @@
zope.event.notify(interfaces.DatabaseOpenedWithRoot(db))
+
########################################################################
########################################################################
More information about the Checkins
mailing list