[Zope3-checkins]
SVN: Zope3/branches/srichter-blow-services/src/zope/app/
converted str(zapi.getMultiAdapter((obj, req),
name="absolute_url")) calls to zapi.absoluteURL(obj, req),
where possible throughout zope.app.
Ivo van der Wijk
ivo at amaze.nl
Wed Jan 12 11:12:39 EST 2005
Log message for revision 28806:
converted str(zapi.getMultiAdapter((obj, req), name="absolute_url")) calls to zapi.absoluteURL(obj, req), where possible throughout zope.app.
Changed:
U Zope3/branches/srichter-blow-services/src/zope/app/apidoc/classmodule/browser.py
U Zope3/branches/srichter-blow-services/src/zope/app/container/browser/adding.py
U Zope3/branches/srichter-blow-services/src/zope/app/container/browser/tests/test_adding.py
U Zope3/branches/srichter-blow-services/src/zope/app/dav/propfind.py
U Zope3/branches/srichter-blow-services/src/zope/app/dav/proppatch.py
U Zope3/branches/srichter-blow-services/src/zope/app/dav/tests/test_propfind.py
U Zope3/branches/srichter-blow-services/src/zope/app/dav/tests/test_proppatch.py
U Zope3/branches/srichter-blow-services/src/zope/app/demo/pagelet/app.py
U Zope3/branches/srichter-blow-services/src/zope/app/externaleditor/browser/__init__.py
U Zope3/branches/srichter-blow-services/src/zope/app/introspector/browser.py
U Zope3/branches/srichter-blow-services/src/zope/app/sqlscript/browser/sqlscript.py
-=-
Modified: Zope3/branches/srichter-blow-services/src/zope/app/apidoc/classmodule/browser.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/apidoc/classmodule/browser.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/apidoc/classmodule/browser.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -120,8 +120,7 @@
klass = zapi.traverse(classModule, p.replace('.', '/'))
results.append(
{'path': p,
- 'url': zapi.getMultiAdapter(
- (klass, self.request), name='absolute_url')()
+ 'url': zapi.absoluteURL(klass, self.request)
})
results.sort(lambda x, y: cmp(x['path'], y['path']))
return results
@@ -172,8 +171,7 @@
'http://127.0.0.1'
"""
m = zapi.getUtility(IDocumentationModule, "Class")
- return zapi.getMultiAdapter(
- (zapi.getParent(m), self.request), name='absolute_url')()
+ return zapi.absoluteURL(zapi.getParent(m), self.request)
def getHTMLContents(self):
"""Return an HTML markup version of the ZCML file with links to other
@@ -482,8 +480,7 @@
path = getPythonPath(unwrapped_cls)
try:
klass = zapi.traverse(classModule, path.replace('.', '/'))
- url = zapi.getMultiAdapter(
- (klass, self.request), name='absolute_url')()
+ url = zapi.absoluteURL(klass, self.request)
except TraversalError:
# If one of the classes is implemented in C, we will not
# be able to find it.
@@ -507,8 +504,7 @@
'http://127.0.0.1'
"""
m = zapi.getUtility(IDocumentationModule, "Class")
- return zapi.getMultiAdapter(
- (zapi.getParent(m), self.request), name='absolute_url')()
+ return zapi.absoluteURL(zapi.getParent(m), self.request)
def getInterfaces(self):
@@ -691,8 +687,7 @@
('url', 'http://127.0.0.1/zope/app/apidoc/classmodule/cleanUp')]]
"""
entries = [{'name': name,
- 'url': zapi.getMultiAdapter(
- (obj, self.request), name='absolute_url')(),
+ 'url': zapi.absoluteURL(obj, self.request),
'ismodule': zapi.isinstance(obj, Module),
'isclass': zapi.isinstance(obj, Class),
'isfunction': zapi.isinstance(obj, Function),
@@ -731,8 +726,7 @@
while removeSecurityProxy(module).__class__ is Module:
crumbs.append(
{'name': zapi.name(module),
- 'url': zapi.getMultiAdapter(
- (module, self.request), name='absolute_url')()}
+ 'url': zapi.absoluteURL(module, self.request)}
)
module = zapi.getParent(module)
Modified: Zope3/branches/srichter-blow-services/src/zope/app/container/browser/adding.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/container/browser/adding.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/container/browser/adding.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -78,9 +78,7 @@
def nextURL(self):
"""See zope.app.container.interfaces.IAdding"""
- return (str(
- zapi.getMultiAdapter((self.context, self.request), "absolute_url"))
- + '/@@contents.html')
+ return zapi.absoluteURL(self.context, self.request) + '/@@contents.html'
# set in BrowserView.__init__
request = None
Modified: Zope3/branches/srichter-blow-services/src/zope/app/container/browser/tests/test_adding.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/container/browser/tests/test_adding.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/container/browser/tests/test_adding.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -80,8 +80,7 @@
if IContainmentRoot.providedBy(self.context):
return ''
name = self.context.__name__
- url = str(zapi.getMultiAdapter(
- (zapi.getParent(self.context), self.request), name='absolute_url'))
+ url = zapi.absoluteURL(zapi.getParent(self.context), self.request)
url += '/' + name
return url
Modified: Zope3/branches/srichter-blow-services/src/zope/app/dav/propfind.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/dav/propfind.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/dav/propfind.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -66,8 +66,7 @@
self.request.response.setStatus(400)
return ''
- resource_url = str(zapi.getMultiAdapter((self.context, self.request),
- name='absolute_url'))
+ resource_url = zapi.absoluteURL(self.context, self.request)
if IReadContainer.providedBy(self.context):
resource_url += '/'
Modified: Zope3/branches/srichter-blow-services/src/zope/app/dav/proppatch.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/dav/proppatch.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/dav/proppatch.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -59,8 +59,7 @@
self.request.response.setStatus(400)
return ''
- resource_url = str(zapi.getMultiAdapter((self.context, self.request),
- name='absolute_url'))
+ resource_url = zapi.absoluteURL(self.context, self.request)
if IReadContainer.providedBy(self.context):
resource_url += '/'
Modified: Zope3/branches/srichter-blow-services/src/zope/app/dav/tests/test_propfind.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/dav/tests/test_propfind.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/dav/tests/test_propfind.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -226,8 +226,7 @@
''' % req
request = _createRequest(body=body, headers={
'Content-type': 'text/xml', 'Depth': depth})
- resource_url = str(zapi.getMultiAdapter((obj, request),
- name='absolute_url'))
+ resource_url = zapi.absoluteURL(obj, request)
if IReadContainer.providedBy(obj):
resource_url += '/'
if resp is None:
Modified: Zope3/branches/srichter-blow-services/src/zope/app/dav/tests/test_proppatch.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/dav/tests/test_proppatch.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/dav/tests/test_proppatch.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -234,8 +234,7 @@
def _checkProppatch(self, obj, ns=(), set=(), rm=(), extra='', expect=''):
request = _createRequest(namespaces=ns, set=set, remove=rm,
extra=extra)
- resource_url = str(
- zapi.getMultiAdapter((obj, request), name='absolute_url'))
+ resource_url = zapi.absoluteURL(obj, request)
expect = '''<?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:"><response>
<href>%%(resource_url)s</href>
Modified: Zope3/branches/srichter-blow-services/src/zope/app/demo/pagelet/app.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/demo/pagelet/app.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/demo/pagelet/app.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -13,7 +13,7 @@
##############################################################################
"""Pagelet Demo
-$Id:$
+$Id$
"""
__docformat__ = 'restructuredtext'
Modified: Zope3/branches/srichter-blow-services/src/zope/app/externaleditor/browser/__init__.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/externaleditor/browser/__init__.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/externaleditor/browser/__init__.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -30,7 +30,7 @@
response = request.response
r = []
- url = zapi.getMultiAdapter((context, request), name='absolute_url')()
+ url = zapi.absoluteURL(context, request)
r.append('url:%s' % url)
adapted = IReadFile(context)
Modified: Zope3/branches/srichter-blow-services/src/zope/app/introspector/browser.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/introspector/browser.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/introspector/browser.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -36,7 +36,7 @@
sm = zapi.getSiteManager(self.context)
try:
getInterface(self.context, name)
- url = zapi.getMultiAdapter((sm, self.request), name='absolute_url')
+ url = zapi.absoluteURL(sm, self.request)
except ComponentLookupError:
return ""
return "%s/interfacedetail.html?id=%s" % (url, name)
Modified: Zope3/branches/srichter-blow-services/src/zope/app/sqlscript/browser/sqlscript.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/sqlscript/browser/sqlscript.py 2005-01-12 16:12:05 UTC (rev 28805)
+++ Zope3/branches/srichter-blow-services/src/zope/app/sqlscript/browser/sqlscript.py 2005-01-12 16:12:39 UTC (rev 28806)
@@ -127,8 +127,7 @@
name = self.context.contentName
container = self.context.context
obj = container[name]
- url = zapi.getMultiAdapter((obj, self.request),
- name='absolute_url')()
+ url = zapi.absoluteURL(obj, self.request)
url = '%s/test.html' % url
return url
else:
More information about the Zope3-Checkins
mailing list