[Zope3-checkins]
SVN: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_prop
Use new component registration API (and get rid of some ztapi usage)
Philipp von Weitershausen
philikon at philikon.de
Wed Apr 19 12:12:56 EDT 2006
Log message for revision 67142:
Use new component registration API (and get rid of some ztapi usage)
Changed:
U Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py
U Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py
-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py 2006-04-19 16:06:57 UTC (rev 67141)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py 2006-04-19 16:12:56 UTC (rev 67142)
@@ -20,6 +20,7 @@
from unittest import TestCase, TestSuite, main, makeSuite
from datetime import datetime
+import zope.component
from zope.interface import Interface, directlyProvides, implements
from zope.publisher.interfaces.http import IHTTPRequest
@@ -28,14 +29,13 @@
from zope.schema.interfaces import IText, ITextLine, IDatetime, ISequence
from zope.size.interfaces import ISized
from zope.traversing.api import traverse
-from zope.traversing.browser import AbsoluteURL
+from zope.traversing.browser import AbsoluteURL, absoluteURL
from zope.publisher.browser import TestRequest
-from zope.annotation.interfaces import IAnnotatable, IAnnotations
+from zope.annotation.interfaces import IAnnotatable
from zope.annotation.attribute import AttributeAnnotations
from zope.dublincore.interfaces import IZopeDublinCore
from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-from zope.app import zapi
from zope.app.testing import ztapi
from zope.app.container.interfaces import IReadContainer
from zope.app.component.testing import PlacefulSetup
@@ -87,6 +87,7 @@
return request
class FileSized(object):
+ zope.component.adapts(IFile)
implements(ISized)
def __init__(self, context):
@@ -122,20 +123,21 @@
ztapi.browserViewProviding(IDatetime, TextDAVWidget, IDAVWidget)
ztapi.browserViewProviding(ISequence, SequenceDAVWidget, IDAVWidget)
ztapi.browserViewProviding(IXMLText, XMLDAVWidget, IXMLDAVWidget)
- ztapi.provideAdapter(IAnnotatable, IAnnotations, AttributeAnnotations)
- ztapi.provideAdapter(IAnnotatable, IZopeDublinCore,
- ZDCAnnotatableAdapter)
- ztapi.provideAdapter(IAnnotatable, IDAVOpaqueNamespaces,
- DAVOpaqueNamespacesAdapter)
- ztapi.provideAdapter(None, IDAVSchema,
- DAVSchemaAdapter)
- ztapi.provideAdapter(IFile, ISized, FileSized)
- sm = zapi.getGlobalSiteManager()
+
+ zope.component.provideAdapter(AttributeAnnotations, (IAnnotatable,))
+ zope.component.provideAdapter(ZDCAnnotatableAdapter, (IAnnotatable,),
+ IZopeDublinCore)
+ zope.component.provideAdapter(DAVOpaqueNamespacesAdapter,
+ (IAnnotatable,), IDAVOpaqueNamespaces)
+ zope.component.provideAdapter(DAVSchemaAdapter, (None,), IDAVSchema)
+ zope.component.provideAdapter(FileSized)
+
directlyProvides(IDAVSchema, IDAVNamespace)
- sm.provideUtility(IDAVNamespace, IDAVSchema, 'DAV:')
+ zope.component.provideUtility(IDAVSchema, IDAVNamespace, 'DAV:')
+
directlyProvides(IZopeDublinCore, IDAVNamespace)
- sm.provideUtility(IDAVNamespace, IZopeDublinCore,
- 'http://www.purl.org/dc/1.1')
+ zope.component.provideUtility(IZopeDublinCore, IDAVNamespace,
+ 'http://www.purl.org/dc/1.1')
def test_contenttype1(self):
file = self.file
@@ -248,7 +250,7 @@
body = ''
request = _createRequest(body=body, headers={
'Content-type': 'text/xml', 'Depth': depth})
- resource_url = zapi.absoluteURL(obj, request)
+ resource_url = absoluteURL(obj, request)
if IReadContainer.providedBy(obj):
resource_url += '/'
if resp is None:
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py 2006-04-19 16:06:57 UTC (rev 67141)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py 2006-04-19 16:12:56 UTC (rev 67142)
@@ -23,6 +23,7 @@
import transaction
from ZODB.tests.util import DB
+import zope.component
from zope.interface import Interface, implements, directlyProvides
from zope.schema import Text
from zope.schema.interfaces import IText, ISequence
@@ -31,14 +32,13 @@
from zope.publisher.browser import TestRequest
from zope.pagetemplate.tests.util import normalize_xml
from zope.traversing.api import traverse
-from zope.traversing.browser import AbsoluteURL
+from zope.traversing.browser import AbsoluteURL, absoluteURL
from zope.annotation.interfaces import IAnnotatable, IAnnotations
from zope.annotation.attribute import AttributeAnnotations
from zope.dublincore.interfaces import IZopeDublinCore
from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
from zope.dublincore.zopedublincore import ScalarProperty
-from zope.app import zapi
from zope.app.testing import ztapi
from zope.app.component.testing import PlacefulSetup
@@ -148,20 +148,25 @@
'PROPPATCH', proppatch.PROPPATCH)
ztapi.browserViewProviding(IText, TextDAVWidget, IDAVWidget)
ztapi.browserViewProviding(ISequence, SequenceDAVWidget, IDAVWidget)
- ztapi.provideAdapter(IAnnotatable, IAnnotations, AttributeAnnotations)
- ztapi.provideAdapter(IAnnotatable, IZopeDublinCore,
- ZDCAnnotatableAdapter)
- ztapi.provideAdapter(IAnnotatable, IDAVOpaqueNamespaces,
- DAVOpaqueNamespacesAdapter)
- ztapi.provideAdapter(IAnnotatable, ITestSchema, TestSchemaAdapter)
- sm = zapi.getGlobalSiteManager()
+
+ zope.component.provideAdapter(AttributeAnnotations, (IAnnotatable,))
+ zope.component.provideAdapter(ZDCAnnotatableAdapter, (IAnnotatable,),
+ IZopeDublinCore)
+ zope.component.provideAdapter(DAVOpaqueNamespacesAdapter,
+ (IAnnotatable,), IDAVOpaqueNamespaces)
+ zope.component.provideAdapter(TestSchemaAdapter, (IAnnotatable,),
+ ITestSchema)
+
directlyProvides(IDAVSchema, IDAVNamespace)
- sm.provideUtility(IDAVNamespace, IDAVSchema, 'DAV:')
+ zope.component.provideUtility(IDAVSchema, IDAVNamespace, 'DAV:')
+
directlyProvides(IZopeDublinCore, IDAVNamespace)
- sm.provideUtility(IDAVNamespace, IZopeDublinCore,
- 'http://www.purl.org/dc/1.1')
+ zope.component.provideUtility(IZopeDublinCore, IDAVNamespace,
+ 'http://www.purl.org/dc/1.1')
+
directlyProvides(ITestSchema, IDAVNamespace)
- sm.provideUtility(IDAVNamespace, ITestSchema, TestURI)
+ zope.component.provideUtility(ITestSchema, IDAVNamespace, TestURI)
+
self.db = DB()
self.conn = self.db.open()
root = self.conn.root()
@@ -230,7 +235,7 @@
def _checkProppatch(self, obj, ns=(), set=(), rm=(), extra='', expect=''):
request = _createRequest(namespaces=ns, set=set, remove=rm,
extra=extra)
- resource_url = zapi.absoluteURL(obj, request)
+ resource_url = absoluteURL(obj, request)
expect = '''<?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:"><response>
<href>%%(resource_url)s</href>
More information about the Zope3-Checkins
mailing list