[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Using new
UtilityVocabulary package rather than deprecated.
Garrett Smith
garrett at mojave-corp.com
Thu Mar 10 08:01:59 EST 2005
Log message for revision 29431:
Using new UtilityVocabulary package rather than deprecated.
Changed:
U Zope3/trunk/src/zope/app/authentication/configure.zcml
U Zope3/trunk/src/zope/app/dependable/__init__.py
-=-
Modified: Zope3/trunk/src/zope/app/authentication/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/configure.zcml 2005-03-10 12:55:47 UTC (rev 29430)
+++ Zope3/trunk/src/zope/app/authentication/configure.zcml 2005-03-10 13:01:58 UTC (rev 29431)
@@ -15,7 +15,7 @@
</localUtility>
<interface interface=".interfaces.IPrincipalSearchPlugin" />
-
+
<browser:addMenuItem
class=".authentication.LocalPluggableAuthentication"
title="Pluggable Authentication Utility"
@@ -32,36 +32,36 @@
<vocabulary
name="ExtractionPlugins"
- factory="zope.app.utility.vocabulary.UtilityVocabulary"
- interface="zope.app.authentication.interfaces.IExtractionPlugin"
+ factory="zope.app.component.vocabulary.UtilityVocabulary"
+ interface="zope.app.authentication.interfaces.IExtractionPlugin"
nameOnly="True"
/>
<vocabulary
name="AuthenticationPlugins"
- factory="zope.app.utility.vocabulary.UtilityVocabulary"
- interface="zope.app.authentication.interfaces.IAuthenticationPlugin"
+ factory="zope.app.component.vocabulary.UtilityVocabulary"
+ interface="zope.app.authentication.interfaces.IAuthenticationPlugin"
nameOnly="True"
/>
<vocabulary
name="ChallengePlugins"
- factory="zope.app.utility.vocabulary.UtilityVocabulary"
- interface="zope.app.authentication.interfaces.IChallengePlugin"
+ factory="zope.app.component.vocabulary.UtilityVocabulary"
+ interface="zope.app.authentication.interfaces.IChallengePlugin"
nameOnly="True"
/>
<vocabulary
name="PrincipalFactoryPlugins"
- factory="zope.app.utility.vocabulary.UtilityVocabulary"
- interface="zope.app.authentication.interfaces.IPrincipalFactoryPlugin"
+ factory="zope.app.component.vocabulary.UtilityVocabulary"
+ interface="zope.app.authentication.interfaces.IPrincipalFactoryPlugin"
nameOnly="True"
/>
<vocabulary
name="PrincipalSearchPlugins"
- factory="zope.app.utility.vocabulary.UtilityVocabulary"
- interface="zope.app.authentication.interfaces.IPrincipalSearchPlugin"
+ factory="zope.app.component.vocabulary.UtilityVocabulary"
+ interface="zope.app.authentication.interfaces.IPrincipalSearchPlugin"
nameOnly="True"
/>
Modified: Zope3/trunk/src/zope/app/dependable/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/dependable/__init__.py 2005-03-10 12:55:47 UTC (rev 29430)
+++ Zope3/trunk/src/zope/app/dependable/__init__.py 2005-03-10 13:01:58 UTC (rev 29431)
@@ -38,7 +38,10 @@
except TypeError:
parent = None
if parent is not None:
- pp = getPath(parent)
+ try:
+ pp = getPath(parent)
+ except TypeError:
+ pp = ""
if not pp.endswith("/"):
pp += "/"
self.pp = pp # parentpath
More information about the Zope3-Checkins
mailing list