[Checkins] SVN: zope.app.preference/trunk/src/zope/app/preference/
Substitute zope.app.zapi by direct calls to its wrapped apis.
See bug 219302
Lorenzo Gil
lgs at sicem.biz
Thu Apr 24 14:40:29 EDT 2008
Log message for revision 85701:
Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302
Changed:
U zope.app.preference/trunk/src/zope/app/preference/README.txt
U zope.app.preference/trunk/src/zope/app/preference/browser.py
U zope.app.preference/trunk/src/zope/app/preference/preference.py
-=-
Modified: zope.app.preference/trunk/src/zope/app/preference/README.txt
===================================================================
--- zope.app.preference/trunk/src/zope/app/preference/README.txt 2008-04-24 18:32:38 UTC (rev 85700)
+++ zope.app.preference/trunk/src/zope/app/preference/README.txt 2008-04-24 18:40:28 UTC (rev 85701)
@@ -338,8 +338,8 @@
Now we can use the preference system in its intended way. We access the folder
settings as follows:
- >>> from zope.app import zapi
- >>> prefs = zapi.getUtility(interfaces.IPreferenceGroup)
+ >>> import zope.component
+ >>> prefs = zope.component.getUtility(interfaces.IPreferenceGroup)
>>> prefs.ZMISettings.Folder.sortedBy
'size'
@@ -438,9 +438,10 @@
We can now access the preferences as follows:
- >>> zapi.traverse(None, '++preferences++ZMISettings/skin')
+ >>> from zope.traversing.api import traverse
+ >>> traverse(None, '++preferences++ZMISettings/skin')
'Basic'
- >>> zapi.traverse(None, '++preferences++/ZMISettings/skin')
+ >>> traverse(None, '++preferences++/ZMISettings/skin')
'Basic'
Modified: zope.app.preference/trunk/src/zope/app/preference/browser.py
===================================================================
--- zope.app.preference/trunk/src/zope/app/preference/browser.py 2008-04-24 18:32:38 UTC (rev 85700)
+++ zope.app.preference/trunk/src/zope/app/preference/browser.py 2008-04-24 18:40:28 UTC (rev 85701)
@@ -18,13 +18,14 @@
__docformat__ = 'restructuredtext'
import re
+import zope.component
import zope.interface
import zope.schema
from zope.security.proxy import removeSecurityProxy
from zope.i18n import translate
from zope.i18nmessageid import Message
+from zope.traversing.api import getParent, getRoot
-from zope.app import zapi
from zope.app.basicskin.standardmacros import StandardMacros
from zope.app.container.interfaces import IObjectFindFilter
from zope.app.form.browser.editview import EditView
@@ -53,7 +54,7 @@
return True
if interfaces.IPreferenceGroup.providedBy(obj):
- parent = zapi.getParent(obj)
+ parent = getParent(obj)
if interfaces.IPreferenceCategory.providedBy(parent):
return True
@@ -64,7 +65,7 @@
"""Preferences Tree using the stateful cookie tree."""
def tree(self):
- root = zapi.getRoot(self.context)
+ root = getRoot(self.context)
filter = PreferenceGroupFilter()
return self.cookieTree(root, filter)
@@ -100,6 +101,6 @@
return u''
# Render the description as ReST.
- source = zapi.createObject('zope.source.rest', text)
- renderer = zapi.getMultiAdapter((source, self.request))
+ source = zope.component.createObject('zope.source.rest', text)
+ renderer = zope.component.getMultiAdapter((source, self.request))
return renderer.render()
Modified: zope.app.preference/trunk/src/zope/app/preference/preference.py
===================================================================
--- zope.app.preference/trunk/src/zope/app/preference/preference.py 2008-04-24 18:32:38 UTC (rev 85700)
+++ zope.app.preference/trunk/src/zope/app/preference/preference.py 2008-04-24 18:40:28 UTC (rev 85701)
@@ -28,13 +28,12 @@
from zope.annotation.interfaces import IAnnotations
import zope.app.component.hooks
-from zope.app import zapi
from zope.app.container.contained import Contained
from zope.app.container.interfaces import IReadContainer
-from zope.app.preference.interfaces import IPreferenceGroup
-from zope.app.preference.interfaces import IPreferenceCategory
-from zope.app.preference.interfaces import IDefaultPreferenceProvider
+from zope.app.preference.interfaces import IPreferenceGroup
+from zope.app.preference.interfaces import IPreferenceCategory
+from zope.app.preference.interfaces import IDefaultPreferenceProvider
pref_key = 'zope.app.user.UserPreferences'
@@ -42,7 +41,7 @@
class PreferenceGroup(Location):
"""A feature-rich ``IPreferenceGroup`` implementation.
- This class implements the
+ This class implements the
"""
zope.interface.implements(IPreferenceGroup, IReadContainer)
@@ -72,7 +71,7 @@
# Store the actual parent in ``__parent``. Usually we would just override
# the property to an actual value during binding, but because we overrode
- # ``__setattr__`` this is not possible anymore.
+ # ``__setattr__`` this is not possible anymore.
__parent = None
def __parent__(self):
return self.__parent or zope.app.component.hooks.getSite()
@@ -88,16 +87,17 @@
def get(self, key, default=None):
id = self.__id__ and self.__id__ + '.' + key or key
- group = zapi.queryUtility(IPreferenceGroup, id, default)
+ group = zope.component.queryUtility(IPreferenceGroup, id, default)
if group is default:
return default
return group.__bind__(self)
-
+
def items(self):
cutoff = self.__id__ and len(self.__id__)+1 or 0
+ utilities = zope.component.getUtilitiesFor(IPreferenceGroup)
return [(id[cutoff:], group.__bind__(self))
- for id, group in zapi.getUtilitiesFor(IPreferenceGroup)
+ for id, group in utilities
if id != self.__id__ and \
id.startswith(self.__id__) and \
id[cutoff:].find('.') == -1]
@@ -128,7 +128,7 @@
def __len__(self):
"""See zope.app.container.interfaces.IReadContainer"""
- return len(self.items())
+ return len(self.items())
def __getattr__(self, key):
# Try to find a sub-group of the given id
@@ -142,8 +142,10 @@
value = self.data.get(key, marker)
if value is marker:
# Try to find a default preference provider
- provider = zapi.queryUtility(IDefaultPreferenceProvider,
- context=self)
+ provider = zope.component.queryUtility(
+ IDefaultPreferenceProvider,
+ context=self
+ )
if provider is None:
return self.__schema__[key].default
defaultGroup = provider.getDefaultPreferenceGroup(self.__id__)
@@ -227,8 +229,8 @@
def UserPreferences(context=None):
"""Adapts an ``ILocation`` object to the ``IUserPreferences`` interface."""
if context is None:
- context = zapi.getSiteManager()
- rootGroup = zapi.getUtility(IPreferenceGroup)
+ context = zope.component.getSiteManager()
+ rootGroup = zope.component.getUtility(IPreferenceGroup)
rootGroup = rootGroup.__bind__(context)
rootGroup.__name__ = '++preferences++'
zope.interface.alsoProvides(rootGroup, IContainmentRoot)
@@ -239,9 +241,9 @@
def __init__(self, ob, request=None):
self.context = ob
-
+
def traverse(self, name, ignore):
- rootGroup = zapi.getUtility(IPreferenceGroup)
+ rootGroup = zope.component.getUtility(IPreferenceGroup)
rootGroup = rootGroup.__bind__(self.context)
rootGroup.__name__ = '++preferences++'
zope.interface.alsoProvides(rootGroup, IContainmentRoot)
More information about the Checkins
mailing list