[Checkins] SVN: z3c.dav/trunk/src/z3c/dav/ Replace zope.webdav with
z3c.dav and zope.etree with z3c.etree.
Michael Kerrin
michael.kerrin at openapp.ie
Wed May 2 14:42:55 EDT 2007
Log message for revision 75023:
Replace zope.webdav with z3c.dav and zope.etree with z3c.etree.
Changed:
U z3c.dav/trunk/src/z3c/dav/README.txt
U z3c.dav/trunk/src/z3c/dav/SETUP.cfg
U z3c.dav/trunk/src/z3c/dav/adapters.py
U z3c.dav/trunk/src/z3c/dav/configure.zcml
U z3c.dav/trunk/src/z3c/dav/copymove.py
U z3c.dav/trunk/src/z3c/dav/coreproperties.py
U z3c.dav/trunk/src/z3c/dav/datamodel.txt
U z3c.dav/trunk/src/z3c/dav/deadproperties.py
U z3c.dav/trunk/src/z3c/dav/exceptions/__init__.py
U z3c.dav/trunk/src/z3c/dav/exceptions/browser.py
U z3c.dav/trunk/src/z3c/dav/exceptions/configure.zcml
U z3c.dav/trunk/src/z3c/dav/exceptions/ftests/test_baseexceptions.py
U z3c.dav/trunk/src/z3c/dav/exceptions/tests/test_multiviews.py
U z3c.dav/trunk/src/z3c/dav/exceptions/tests/test_simpleviews.py
U z3c.dav/trunk/src/z3c/dav/ftests/__init__.py
U z3c.dav/trunk/src/z3c/dav/ftests/dav.py
U z3c.dav/trunk/src/z3c/dav/ftests/ftesting-locking.zcml
U z3c.dav/trunk/src/z3c/dav/ftests/ftesting.zcml
U z3c.dav/trunk/src/z3c/dav/ftests/test_propfind.py
U z3c.dav/trunk/src/z3c/dav/ftests/test_proppatch.py
U z3c.dav/trunk/src/z3c/dav/ftests/test_z3_locking.py
U z3c.dav/trunk/src/z3c/dav/interfaces.py
U z3c.dav/trunk/src/z3c/dav/locking.py
U z3c.dav/trunk/src/z3c/dav/locking.txt
U z3c.dav/trunk/src/z3c/dav/lockingutils.py
U z3c.dav/trunk/src/z3c/dav/mkcol.py
U z3c.dav/trunk/src/z3c/dav/properties.py
U z3c.dav/trunk/src/z3c/dav/propfind.py
U z3c.dav/trunk/src/z3c/dav/proppatch.py
U z3c.dav/trunk/src/z3c/dav/publisher.py
U z3c.dav/trunk/src/z3c/dav/tests/__init__.py
U z3c.dav/trunk/src/z3c/dav/tests/test_copymove.py
U z3c.dav/trunk/src/z3c/dav/tests/test_doctests.py
U z3c.dav/trunk/src/z3c/dav/tests/test_inputwidgets.py
U z3c.dav/trunk/src/z3c/dav/tests/test_propfind.py
U z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py
U z3c.dav/trunk/src/z3c/dav/tests/test_publisher.py
U z3c.dav/trunk/src/z3c/dav/tests/test_widgets.py
U z3c.dav/trunk/src/z3c/dav/tests/utils.py
U z3c.dav/trunk/src/z3c/dav/utils.py
U z3c.dav/trunk/src/z3c/dav/widgets.py
U z3c.dav/trunk/src/z3c/dav/z3-configure.zcml
U z3c.dav/trunk/src/z3c/dav/zope.webdav-configure.zcml
-=-
Modified: z3c.dav/trunk/src/z3c/dav/README.txt
===================================================================
--- z3c.dav/trunk/src/z3c/dav/README.txt 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/README.txt 2007-05-02 18:42:54 UTC (rev 75023)
@@ -2,7 +2,7 @@
Introduction
============
-The *zope.webdav* package is an implementation of the WebDAV protocol.
+The *z3c.dav* package is an implementation of the WebDAV protocol.
It includes support for all the different methods, properties and error codes
has defined in RFC2518 and draft-ietf-webdav-rfc2518bis-15.txt.
@@ -12,17 +12,17 @@
This module should be installed like any other Zope3 module, that is it should
be copied verbatim into your Python path and all zcml slugs should be installed
into the *package-includes* directory. The zcml slugs for this package include
-*zope.webdav-configure.zcml* and *ietree-configure.zcml*. If you want to run
+*z3c.dav-configure.zcml* and *ietree-configure.zcml*. If you want to run
the functional tests successfully then you must also install the
-*zope.webdav-ftesting.zcml* file.
+*z3c.dav-ftesting.zcml* file.
Now the *ietree-configure.zcml* file tells Zope what ElementTree engine you
want to use to process the XML. You will probably want to edit this file to
use the elementtree implementation that is installed on your system. There are
two supported implementations, ElementTree and lxml. To use ElementTree
-just make sure that the utility declaration for *zope.webdav.zetree.EtreeEtree*
+just make sure that the utility declaration for *z3c.dav.zetree.EtreeEtree*
is the only uncommented utility declaration. For lxml just make sure that
-*zope.webdav.zetree.LxmlEtree* is the only uncommented utility declaration.
+*z3c.dav.zetree.LxmlEtree* is the only uncommented utility declaration.
Data Model
==========
@@ -37,7 +37,7 @@
property names must be strings that conform to the syntax of ElementTree's
element name (or tag). For example, for the property *getcontenttype* which
belongs to the *DAV:* XML namespace will be referenced by the name
-*{DAV:}getcontenttype* within *zope.webdav*.
+*{DAV:}getcontenttype* within *z3c.dav*.
Error Handling
==============
@@ -53,7 +53,7 @@
defined new exceptions that should be raised if a request can not be processed
for a specific reason.
-When a multi-status response is desirable then *zope.webdav* will encapsulate
+When a multi-status response is desirable then *z3c.dav* will encapsulate
all the errors that occurred during the request into either a
*webdav.interfaces.WebDAVErrors* or a *webdav.interfaces.WebDAVPropstatErrors*
exception and throw this error to the publisher. The publisher will then abort
@@ -85,4 +85,4 @@
+ *webdav.interfaces.AlreadyLocked*
-.. _WebDAV Data Model: zope.webdav.datamodel/@@show.html
+.. _WebDAV Data Model: z3c.dav.datamodel/@@show.html
Modified: z3c.dav/trunk/src/z3c/dav/SETUP.cfg
===================================================================
--- z3c.dav/trunk/src/z3c/dav/SETUP.cfg 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/SETUP.cfg 2007-05-02 18:42:54 UTC (rev 75023)
@@ -1,5 +1,5 @@
# Tell zpkg how to install the ZCML slugs.
<data-files zopeskel/etc/package-includes>
- zope.webdav-configure.zcml
+ z3c.dav-configure.zcml
</data-files>
Modified: z3c.dav/trunk/src/z3c/dav/adapters.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/adapters.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/adapters.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -22,7 +22,7 @@
from zope.annotation.interfaces import IAnnotatable
import zope.app.file.interfaces
-import zope.webdav.coreproperties
+import z3c.dav.coreproperties
class DAVSchemaAdapter(object):
@@ -81,7 +81,7 @@
True
"""
- interface.implements(zope.webdav.coreproperties.IDAVCoreSchema)
+ interface.implements(z3c.dav.coreproperties.IDAVCoreSchema)
component.adapts(IAnnotatable,
zope.publisher.interfaces.http.IHTTPRequest)
@@ -123,7 +123,7 @@
>>> from zope.interface.verify import verifyObject
>>> file = File('some data for the file', 'text/plain')
>>> adapter = DAVFileGetSchema(file, None)
- >>> verifyObject(zope.webdav.coreproperties.IDAVGetSchema, adapter)
+ >>> verifyObject(z3c.dav.coreproperties.IDAVGetSchema, adapter)
True
>>> adapter.getcontentlanguage is None
True
@@ -165,7 +165,7 @@
True
"""
- interface.implements(zope.webdav.coreproperties.IDAVGetSchema)
+ interface.implements(z3c.dav.coreproperties.IDAVGetSchema)
component.adapts(zope.app.file.interfaces.IFile,
zope.publisher.interfaces.http.IHTTPRequest)
Modified: z3c.dav/trunk/src/z3c/dav/configure.zcml
===================================================================
--- z3c.dav/trunk/src/z3c/dav/configure.zcml 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/configure.zcml 2007-05-02 18:42:54 UTC (rev 75023)
@@ -2,7 +2,7 @@
xmlns="http://namespaces.zope.org/zope"
i18n_domain="zope.app.dav">
- <include package="zope.webdav.exceptions" />
+ <include package="z3c.dav.exceptions" />
<!--
Support for integrating the protocol request handlers found in
@@ -42,16 +42,16 @@
<adapter
for="zope.interface.Interface
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.interfaces.IWebDAVMethod"
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.interfaces.IWebDAVMethod"
factory=".locking.LOCK"
name="LOCK"
/>
<adapter
for="zope.interface.Interface
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.interfaces.IWebDAVMethod"
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.interfaces.IWebDAVMethod"
factory=".locking.UNLOCK"
name="UNLOCK"
/>
@@ -231,23 +231,23 @@
xmlns="http://namespaces.zope.org/apidoc">
<bookchapter
- id="zope.webdav"
+ id="z3c.dav"
title="WebDAV"
doc_path="README.txt"
/>
<bookchapter
- id="zope.webdav.datamodel"
+ id="z3c.dav.datamodel"
title="WebDAV Data Model"
doc_path="datamodel.txt"
- parent="zope.webdav"
+ parent="z3c.dav"
/>
<bookchapter
- id="zope.webdav.locking"
+ id="z3c.dav.locking"
title="Locking"
doc_path="locking.txt"
- parent="zope.webdav"
+ parent="z3c.dav"
/>
</configure>
Modified: z3c.dav/trunk/src/z3c/dav/copymove.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/copymove.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/copymove.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -29,11 +29,11 @@
from zope.traversing.browser import absoluteURL
from zope.app.publication.http import MethodNotAllowed
-import zope.webdav.interfaces
+import z3c.dav.interfaces
class Base(object):
- interface.implements(zope.webdav.interfaces.IWebDAVMethod)
- component.adapts(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
+ interface.implements(z3c.dav.interfaces.IWebDAVMethod)
+ component.adapts(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
def __init__(self, context, request):
self.context = context
@@ -46,7 +46,7 @@
elif overwrite == "f":
overwrite = False
else:
- raise zope.webdav.interfaces.BadRequest(
+ raise z3c.dav.interfaces.BadRequest(
self.request, message = u"Invalid overwrite header")
return overwrite
@@ -56,7 +56,7 @@
while dest and dest[-1] == "/":
dest = dest[:-1]
if not dest:
- raise zope.webdav.interfaces.BadRequest(
+ raise z3c.dav.interfaces.BadRequest(
self.request, message = u"No `destination` header sent.")
scheme, location, destpath, query, fragment = urlparse.urlsplit(dest)
@@ -69,7 +69,7 @@
# namespace, or the destination namespace refuses to accept
# the resource. The client may wish to try GET/PUT and
# PROPFIND/PROPPATCH instead.
- raise zope.webdav.interfaces.BadGateway(
+ raise z3c.dav.interfaces.BadGateway(
self.context, self.request)
return destpath
@@ -92,15 +92,15 @@
try:
parent = traverse(getRoot(self.context), parentpath)
except TraversalError:
- raise zope.webdav.interfaces.ConflictError(
+ raise z3c.dav.interfaces.ConflictError(
self.context, message = u"Destination resource has no parent")
if destob is not None and not overwrite:
- raise zope.webdav.interfaces.PreconditionFailed(
+ raise z3c.dav.interfaces.PreconditionFailed(
self.context,
message = "destination exists and OverWrite header is F")
elif destob is not None and destob == self.context:
- raise zope.webdav.interfaces.ForbiddenError(
+ raise z3c.dav.interfaces.ForbiddenError(
self.context,
message = "destionation and source objects are the same")
elif destob is not None:
@@ -122,7 +122,7 @@
if not copier.copyableTo(parent, destname):
# Conflict
- raise zope.webdav.interfaces.ConflictError(
+ raise z3c.dav.interfaces.ConflictError(
self.context,
message = u"can not copy to the destionation folder")
@@ -150,7 +150,7 @@
destname, destob, parent = self.getDestinationNameAndParentObject()
if not mover.moveableTo(parent, destname):
- raise zope.webdav.interfaces.ConflictError(
+ raise z3c.dav.interfaces.ConflictError(
self.context,
message = u"can not copy to the destionation folder")
Modified: z3c.dav/trunk/src/z3c/dav/coreproperties.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/coreproperties.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/coreproperties.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -26,8 +26,8 @@
import zope.app.container.interfaces
import zope.publisher.interfaces.http
-from zope.webdav.properties import DAVProperty, DeadField
-import zope.webdav.widgets
+from z3c.dav.properties import DAVProperty, DeadField
+import z3c.dav.widgets
class IDAVCreationdate(interface.Interface):
@@ -283,21 +283,21 @@
"""
-class LockdiscoveryDAVWidget(zope.webdav.widgets.ListDAVWidget):
+class LockdiscoveryDAVWidget(z3c.dav.widgets.ListDAVWidget):
"""
Custom widget for the `{DAV:}lockdiscovery` property. This is basically
a list widget but it doesn't display any sub XML element whose value
is equal to its field missing_value.
>>> import zope.schema.interfaces
- >>> from zope.webdav.tests import test_widgets
+ >>> from z3c.dav.tests import test_widgets
Setup some adapters for rendering the widget.
>>> gsm = component.getGlobalSiteManager()
- >>> gsm.registerAdapter(zope.webdav.widgets.TextDAVWidget,
+ >>> gsm.registerAdapter(z3c.dav.widgets.TextDAVWidget,
... (zope.schema.interfaces.IText, None))
- >>> gsm.registerAdapter(zope.webdav.widgets.IntDAVWidget,
+ >>> gsm.registerAdapter(z3c.dav.widgets.IntDAVWidget,
... (zope.schema.interfaces.IInt, None))
Setup a field and test object to render. While this is not the same field
@@ -346,23 +346,23 @@
Clean up the component registration.
- >>> gsm.unregisterAdapter(zope.webdav.widgets.TextDAVWidget,
+ >>> gsm.unregisterAdapter(z3c.dav.widgets.TextDAVWidget,
... (zope.schema.interfaces.IText, None))
True
- >>> gsm.unregisterAdapter(zope.webdav.widgets.IntDAVWidget,
+ >>> gsm.unregisterAdapter(z3c.dav.widgets.IntDAVWidget,
... (zope.schema.interfaces.IInt, None))
True
"""
- interface.classProvides(zope.webdav.interfaces.IIDAVWidget)
+ interface.classProvides(z3c.dav.interfaces.IIDAVWidget)
def render(self):
- etree = zope.etree.getEngine()
+ etree = z3c.etree.getEngine()
el = etree.Element(etree.QName(self.namespace, self.name))
if self._value is not self.context.missing_value:
for value in self._value:
- widget = zope.webdav.widgets.ObjectDAVWidget(
+ widget = z3c.dav.widgets.ObjectDAVWidget(
self.context.value_type, self.request)
widget.render_missing_values = False
widget.setRenderedValue(value)
@@ -380,7 +380,7 @@
################################################################################
creationdate = DAVProperty("{DAV:}creationdate", IDAVCreationdate)
-creationdate.custom_widget = zope.webdav.widgets.ISO8601DatetimeDAVWidget
+creationdate.custom_widget = z3c.dav.widgets.ISO8601DatetimeDAVWidget
displayname = DAVProperty("{DAV:}displayname", IDAVDisplayname)
Modified: z3c.dav/trunk/src/z3c/dav/datamodel.txt
===================================================================
--- z3c.dav/trunk/src/z3c/dav/datamodel.txt 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/datamodel.txt 2007-05-02 18:42:54 UTC (rev 75023)
@@ -16,12 +16,12 @@
verbatim.
Dead properties are just stored, edited or deleted through a adapter
-*zope.webdav.interfaces.IOpaquePropertyStorage* adapter. This just stores the
+*z3c.dav.interfaces.IOpaquePropertyStorage* adapter. This just stores the
data sent through a PROPPATCH request, performing no checks on the value of
the data sent.
Live properties are declared in advanace by declaring a utility which
-implements *zope.webdav.interfaces.IDAVProperty*. *IAVProperty* is just a data
+implements *z3c.dav.interfaces.IDAVProperty*. *IAVProperty* is just a data
structure containing all the information neccessary to process a request.
This information includes:
@@ -52,28 +52,28 @@
>>> from zope import schema
>>> import zope.schema.interfaces
>>> from zope import component
- >>> import zope.webdav.properties
- >>> import zope.webdav.interfaces
- >>> import zope.webdav.publisher
- >>> import zope.webdav.widgets
+ >>> import z3c.dav.properties
+ >>> import z3c.dav.interfaces
+ >>> import z3c.dav.publisher
+ >>> import z3c.dav.widgets
>>> from cStringIO import StringIO
>>> component.getGlobalSiteManager().registerAdapter(
- ... zope.webdav.widgets.IntDAVWidget,
- ... (zope.schema.interfaces.IInt, zope.webdav.interfaces.IWebDAVRequest),
- ... zope.webdav.interfaces.IDAVWidget)
+ ... z3c.dav.widgets.IntDAVWidget,
+ ... (zope.schema.interfaces.IInt, z3c.dav.interfaces.IWebDAVRequest),
+ ... z3c.dav.interfaces.IDAVWidget)
>>> component.getGlobalSiteManager().registerAdapter(
- ... zope.webdav.widgets.TextDAVWidget,
+ ... z3c.dav.widgets.TextDAVWidget,
... (zope.schema.interfaces.ITextLine,
- ... zope.webdav.interfaces.IWebDAVRequest),
- ... zope.webdav.interfaces.IDAVWidget)
+ ... z3c.dav.interfaces.IWebDAVRequest),
+ ... z3c.dav.interfaces.IDAVWidget)
>>> class IDemoContent(interface.Interface):
... ageprop = schema.Int(title = u"Age of resource")
>>> class DemoContent(object):
... interface.implements(IDemoContent)
... ageprop = 10
>>> democontent = DemoContent()
- >>> request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ >>> request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
First we must define an interface that defines how we must store and
retrieve the property:
@@ -85,10 +85,10 @@
Now we must declare and register a named utility implementing *IDAVProperty*.
- >>> ageProp = zope.webdav.properties.DAVProperty("{examplens:}age",
+ >>> ageProp = z3c.dav.properties.DAVProperty("{examplens:}age",
... IAgeStorage)
>>> component.getGlobalSiteManager().registerUtility(
- ... ageProp, zope.webdav.interfaces.IDAVProperty, "{examplens:}age")
+ ... ageProp, z3c.dav.interfaces.IDAVProperty, "{examplens:}age")
It order for it to be defined there must be exist a multi-adapter from the
resource to *IAgeStorage*. This allows some properties to be defined for a
@@ -97,12 +97,12 @@
Initially for our resource we have no defined properties, since we haven't
yet implemented the storage adapter.
- >>> list(zope.webdav.properties.getAllProperties(democontent, request))
+ >>> list(z3c.dav.properties.getAllProperties(democontent, request))
[]
- >>> zope.webdav.properties.hasProperty(
+ >>> z3c.dav.properties.hasProperty(
... democontent, request, "{examplens:}age")
False
- >>> zope.webdav.properties.getProperty(
+ >>> z3c.dav.properties.getProperty(
... democontent, request, "{examplens:}age")
Traceback (most recent call last):
...
@@ -112,29 +112,29 @@
>>> class AgeStorage(object):
... interface.implements(IAgeStorage)
- ... component.adapts(IDemoContent, zope.webdav.interfaces.IWebDAVRequest)
+ ... component.adapts(IDemoContent, z3c.dav.interfaces.IWebDAVRequest)
... def __init__(self, context, request):
... self.context = context
... def get_age(self):
... return self.context.ageprop
... age = property(get_age)
>>> component.getGlobalSiteManager().registerAdapter(AgeStorage,
- ... (IDemoContent, zope.webdav.interfaces.IWebDAVRequest), IAgeStorage)
+ ... (IDemoContent, z3c.dav.interfaces.IWebDAVRequest), IAgeStorage)
Since we now defined a storage adapter for the `age` property on our
DemoContent object, the property is defined on this resource.
- >>> zope.webdav.properties.hasProperty(
+ >>> z3c.dav.properties.hasProperty(
... democontent, request, "{examplens:}age")
True
-So now we can ask the *zope.webdav.interfaces.getProperty* method to return the
+So now we can ask the *z3c.dav.interfaces.getProperty* method to return the
*IDAVProperty* utility representing this property and the storage adapter.
- >>> prop, adapter = zope.webdav.properties.getProperty(
+ >>> prop, adapter = z3c.dav.properties.getProperty(
... democontent, request, "{examplens:}age")
>>> print prop #doctest:+ELLIPSIS
- <zope.webdav.properties.DAVProperty ...
+ <z3c.dav.properties.DAVProperty ...
>>> isinstance(adapter, AgeStorage)
True
@@ -144,17 +144,17 @@
10
In order to render this value has a WebDAV response we ask the
-*zope.webdav.properties.getWidget* method to return a widget that knows how to
+*z3c.dav.properties.getWidget* method to return a widget that knows how to
render this type of property.
- >>> davwidget = zope.webdav.properties.getWidget(prop, adapter, request)
+ >>> davwidget = z3c.dav.properties.getWidget(prop, adapter, request)
>>> print etree.tostring(davwidget.render()) #doctest:+XMLDATA
<E:age xmlns:E="examplens:">10</E:age>
-Finally the *zope.webdav.properties.getAllProperties* method contains one entry:
+Finally the *z3c.dav.properties.getAllProperties* method contains one entry:
>>> ['%s, %s' %(prop.namespace, prop.__name__) for prop, adapter in
- ... zope.webdav.properties.getAllProperties(democontent, request)]
+ ... z3c.dav.properties.getAllProperties(democontent, request)]
['examplens:, age']
Clean up Live Properties Test
@@ -163,10 +163,10 @@
By removing the storage adapter the above `age` property disappears.
>>> component.getGlobalSiteManager().unregisterAdapter(AgeStorage,
- ... (IDemoContent, zope.webdav.interfaces.IWebDAVRequest), IAgeStorage)
+ ... (IDemoContent, z3c.dav.interfaces.IWebDAVRequest), IAgeStorage)
True
- >>> prop, adapter = zope.webdav.properties.getProperty(democontent, request,
+ >>> prop, adapter = z3c.dav.properties.getProperty(democontent, request,
... "{examplens:}age")
Traceback (most recent call last):
...
@@ -176,12 +176,12 @@
===============
Dead properties are handled just slightly differently. We first need to setup
-a *zope.webdav.properties.IOpaquePropertyStorage* adapter for our demo content.
+a *z3c.dav.properties.IOpaquePropertyStorage* adapter for our demo content.
>>> import weakref
>>> deadprops = weakref.WeakKeyDictionary()
>>> class DeadProperties(object):
- ... interface.implements(zope.webdav.interfaces.IOpaquePropertyStorage)
+ ... interface.implements(z3c.dav.interfaces.IOpaquePropertyStorage)
... component.adapts(IDemoContent)
... def __init__(self, context):
... self._mapping = deadprops.setdefault(context, {})
@@ -199,25 +199,25 @@
Firstly, we note that the dead property `dpname` doesn't exist because we
have yet to register our DeadProperties class.
- >>> zope.webdav.properties.hasProperty(democontent, request, dpname)
+ >>> z3c.dav.properties.hasProperty(democontent, request, dpname)
False
>>> [prop.__name__ for prop, adapter in
- ... zope.webdav.properties.getAllProperties(democontent, request)]
+ ... z3c.dav.properties.getAllProperties(democontent, request)]
[]
- >>> zope.webdav.properties.getProperty(democontent, request, dpname)
+ >>> z3c.dav.properties.getProperty(democontent, request, dpname)
Traceback (most recent call last):
...
PropertyNotFound: {examplens:}deadprop
>>> component.getGlobalSiteManager().registerAdapter(DeadProperties)
-Since we have defined a *zope.webdav.properties.IOpaquePropertyStorage* adapter,
+Since we have defined a *z3c.dav.properties.IOpaquePropertyStorage* adapter,
we can now set and get any dead properties.
- >>> prop, adapter = zope.webdav.properties.getProperty(
+ >>> prop, adapter = z3c.dav.properties.getProperty(
... democontent, request, dpname)
>>> prop #doctest:+ELLIPSIS
- <zope.webdav.properties.OpaqueProperty object at ...
+ <z3c.dav.properties.OpaqueProperty object at ...
>>> prop.__name__
'deadprop'
>>> prop.namespace
@@ -228,15 +228,15 @@
to call `getProperty` but not to generate the property we change the value
of the keyword arguement `exists` to True.
- >>> zope.webdav.properties.getProperty(
+ >>> z3c.dav.properties.getProperty(
... democontent, request, dpname, exists = True)
Traceback (most recent call last):
...
PropertyNotFound: {examplens:}deadprop
- >>> list(zope.webdav.properties.getAllProperties(democontent, request))
+ >>> list(z3c.dav.properties.getAllProperties(democontent, request))
[]
- >>> zope.webdav.properties.hasProperty(democontent, request, dpname)
+ >>> z3c.dav.properties.hasProperty(democontent, request, dpname)
False
Now set some data.
@@ -245,11 +245,11 @@
>>> field.set(adapter, """<E:deadprop xmlns:E="examplens:">This is some content</E:deadprop>""")
>>> ['%s, %s' %(prop.namespace, prop.__name__) for prop, adapter in
- ... zope.webdav.properties.getAllProperties(democontent, request)]
+ ... z3c.dav.properties.getAllProperties(democontent, request)]
['examplens:, deadprop']
- >>> zope.webdav.properties.hasProperty(democontent, request, dpname)
+ >>> z3c.dav.properties.hasProperty(democontent, request, dpname)
True
- >>> prop, adapter = zope.webdav.properties.getProperty(
+ >>> prop, adapter = z3c.dav.properties.getProperty(
... democontent, request, dpname)
>>> prop is not None
True
@@ -271,19 +271,19 @@
... title = schema.TextLine(
... title = u"Title",
... description = u"Title of the resource")
- >>> nameProp = zope.webdav.properties.DAVProperty(
+ >>> nameProp = z3c.dav.properties.DAVProperty(
... "{examplens:}name", INameStorage)
- >>> titleProp = zope.webdav.properties.DAVProperty("{examplens:}title",
+ >>> titleProp = z3c.dav.properties.DAVProperty("{examplens:}title",
... ITitleStorage)
>>> component.getGlobalSiteManager().registerUtility(
- ... nameProp, zope.webdav.interfaces.IDAVProperty, "{examplens:}name")
+ ... nameProp, z3c.dav.interfaces.IDAVProperty, "{examplens:}name")
>>> component.getGlobalSiteManager().registerUtility(
- ... titleProp, zope.webdav.interfaces.IDAVProperty, "{examplens:}title")
+ ... titleProp, z3c.dav.interfaces.IDAVProperty, "{examplens:}title")
Now write the storage adapter and register with the component architecture.
>>> class Storage(object):
- ... component.adapts(IDemoContent, zope.webdav.interfaces.IWebDAVRequest)
+ ... component.adapts(IDemoContent, z3c.dav.interfaces.IWebDAVRequest)
... interface.implements(INameStorage, ITitleStorage)
... def __init__(self, context, request):
... self.context, self.request = context, request
@@ -306,12 +306,12 @@
Now when we call either the *getProperty* or the *hasProperty* method for only
one of the properties, name or title.
- >>> nprop, adapter = zope.webdav.properties.getProperty(democontent, request,
+ >>> nprop, adapter = z3c.dav.properties.getProperty(democontent, request,
... "{examplens:}name")
- >>> titleprop, adapter = zope.webdav.properties.getProperty(
+ >>> titleprop, adapter = z3c.dav.properties.getProperty(
... democontent, request, "{examplens:}title")
- >>> zope.webdav.properties.hasProperty(democontent, request,
+ >>> z3c.dav.properties.hasProperty(democontent, request,
... "{examplens:}name")
True
@@ -329,7 +329,7 @@
>>> class INameTitleStorage(INameStorage, ITitleStorage):
... """Merge the name and title storage interfaces."""
>>> class NameTitleStorage(object):
- ... component.adapts(IDemoContent, zope.webdav.interfaces.IWebDAVRequest)
+ ... component.adapts(IDemoContent, z3c.dav.interfaces.IWebDAVRequest)
... interface.implements(INameTitleStorage)
... def __init__(self, context, request):
... self.context, self.request = context, request
@@ -345,13 +345,13 @@
... title = property(title_get, title_set)
>>> component.getGlobalSiteManager().registerAdapter(NameTitleStorage)
- >>> zope.webdav.properties.hasProperty(
+ >>> z3c.dav.properties.hasProperty(
... democontent, request, "{examplens:}name")
True
- >>> prop, adapter = zope.webdav.properties.getProperty(democontent, request,
+ >>> prop, adapter = z3c.dav.properties.getProperty(democontent, request,
... "{examplens:}name")
>>> props = [prop for prop, adapter in
- ... zope.webdav.properties.getAllProperties(democontent, request)]
+ ... z3c.dav.properties.getAllProperties(democontent, request)]
>>> props = [prop.__name__ for prop in props]
>>> props.sort()
>>> props
@@ -361,18 +361,18 @@
============
>>> component.getGlobalSiteManager().unregisterAdapter(
- ... zope.webdav.widgets.IntDAVWidget,
- ... (zope.schema.interfaces.IInt, zope.webdav.interfaces.IWebDAVRequest),
- ... zope.webdav.interfaces.IDAVWidget)
+ ... z3c.dav.widgets.IntDAVWidget,
+ ... (zope.schema.interfaces.IInt, z3c.dav.interfaces.IWebDAVRequest),
+ ... z3c.dav.interfaces.IDAVWidget)
True
>>> component.getGlobalSiteManager().unregisterAdapter(
- ... zope.webdav.widgets.TextDAVWidget,
+ ... z3c.dav.widgets.TextDAVWidget,
... (zope.schema.interfaces.ITextLine,
- ... zope.webdav.interfaces.IWebDAVRequest),
- ... zope.webdav.interfaces.IDAVWidget)
+ ... z3c.dav.interfaces.IWebDAVRequest),
+ ... z3c.dav.interfaces.IDAVWidget)
True
>>> component.getGlobalSiteManager().unregisterUtility(
- ... ageProp, zope.webdav.interfaces.IDAVProperty, "{examplens:}age")
+ ... ageProp, z3c.dav.interfaces.IDAVProperty, "{examplens:}age")
True
>>> component.getGlobalSiteManager().unregisterAdapter(DeadProperties)
True
Modified: z3c.dav/trunk/src/z3c/dav/deadproperties.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/deadproperties.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/deadproperties.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -23,9 +23,9 @@
from zope import component
from zope.annotation.interfaces import IAnnotatable, IAnnotations
-import zope.webdav.interfaces
+import z3c.dav.interfaces
-_opaque_namespace_key = "zope.webdav.deadproperties.DAVOpaqueProperties"
+_opaque_namespace_key = "z3c.dav.deadproperties.DAVOpaqueProperties"
class OpaqueProperties(object):
"""
@@ -40,7 +40,7 @@
... interface.implements(IAnnotatable)
>>> resource = DemoContent()
>>> opaqueProperties = OpaqueProperties(resource)
- >>> verifyObject(zope.webdav.interfaces.IOpaquePropertyStorage,
+ >>> verifyObject(z3c.dav.interfaces.IOpaquePropertyStorage,
... opaqueProperties)
True
>>> annotations = IAnnotations(resource)
@@ -107,7 +107,7 @@
True
"""
- interface.implements(zope.webdav.interfaces.IOpaquePropertyStorage)
+ interface.implements(z3c.dav.interfaces.IOpaquePropertyStorage)
component.adapts(IAnnotatable)
_annotations = None
Modified: z3c.dav/trunk/src/z3c/dav/exceptions/__init__.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/exceptions/__init__.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/exceptions/__init__.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -27,14 +27,14 @@
from zope import component
from zope.app.http.interfaces import IHTTPException
-import zope.webdav.interfaces
-import zope.webdav.utils
-from zope.etree.interfaces import IEtree
+import z3c.dav.interfaces
+import z3c.dav.utils
+import z3c.etree
class DAVError(object):
- interface.implements(zope.webdav.interfaces.IDAVErrorWidget)
+ interface.implements(z3c.dav.interfaces.IDAVErrorWidget)
component.adapts(interface.Interface,
- zope.webdav.interfaces.IWebDAVRequest)
+ z3c.dav.interfaces.IWebDAVRequest)
def __init__(self, context, request):
self.context = context
@@ -80,8 +80,8 @@
################################################################################
class MultiStatusErrorView(object):
- component.adapts(zope.webdav.interfaces.IWebDAVErrors,
- zope.webdav.interfaces.IWebDAVRequest)
+ component.adapts(z3c.dav.interfaces.IWebDAVErrors,
+ z3c.dav.interfaces.IWebDAVRequest)
interface.implements(IHTTPException)
def __init__(self, error, request):
@@ -89,8 +89,8 @@
self.request = request
def __call__(self):
- etree = component.getUtility(IEtree)
- multistatus = zope.webdav.utils.MultiStatus()
+ etree = z3c.etree.getEngine()
+ multistatus = z3c.dav.utils.MultiStatus()
seenContext = False
for error in self.error.errors:
@@ -98,10 +98,10 @@
seenContext = True
davwidget = component.getMultiAdapter(
- (error, self.request), zope.webdav.interfaces.IDAVErrorWidget)
+ (error, self.request), z3c.dav.interfaces.IDAVErrorWidget)
- response = zope.webdav.utils.Response(
- zope.webdav.utils.getObjectURL(error.resource, self.request))
+ response = z3c.dav.utils.Response(
+ z3c.dav.utils.getObjectURL(error.resource, self.request))
response.status = davwidget.status
# we don't generate a propstat elements during this view so
# we just ignore the propstatdescription.
@@ -110,8 +110,8 @@
multistatus.responses.append(response)
if not seenContext:
- response = zope.webdav.utils.Response(
- zope.webdav.utils.getObjectURL(
+ response = z3c.dav.utils.Response(
+ z3c.dav.utils.getObjectURL(
self.error.context, self.request))
response.status = 424 # Failed Dependency
multistatus.responses.append(response)
@@ -123,27 +123,27 @@
class WebDAVPropstatErrorView(object):
interface.implements(IHTTPException)
- component.adapts(zope.webdav.interfaces.IWebDAVPropstatErrors,
- zope.webdav.interfaces.IWebDAVRequest)
+ component.adapts(z3c.dav.interfaces.IWebDAVPropstatErrors,
+ z3c.dav.interfaces.IWebDAVRequest)
def __init__(self, error, request):
self.error = error
self.request = request
def __call__(self):
- etree = component.getUtility(IEtree)
- multistatus = zope.webdav.utils.MultiStatus()
+ etree = z3c.etree.getEngine()
+ multistatus = z3c.dav.utils.MultiStatus()
- response = zope.webdav.utils.Response(
- zope.webdav.utils.getObjectURL(self.error.context, self.request))
+ response = z3c.dav.utils.Response(
+ z3c.dav.utils.getObjectURL(self.error.context, self.request))
multistatus.responses.append(response)
for prop, error in self.error.items():
error_view = component.getMultiAdapter(
- (error, self.request), zope.webdav.interfaces.IDAVErrorWidget)
+ (error, self.request), z3c.dav.interfaces.IDAVErrorWidget)
propstat = response.getPropstat(error_view.status)
- if zope.webdav.interfaces.IDAVProperty.providedBy(prop):
+ if z3c.dav.interfaces.IDAVProperty.providedBy(prop):
## XXX - not tested - but is it needed?
prop = "{%s}%s" %(prop.namespace, prop.__name__)
@@ -164,8 +164,8 @@
class HTTPForbiddenError(object):
interface.implements(IHTTPException)
- component.adapts(zope.webdav.interfaces.IForbiddenError,
- zope.webdav.interfaces.IHTTPRequest)
+ component.adapts(z3c.dav.interfaces.IForbiddenError,
+ z3c.dav.interfaces.IHTTPRequest)
def __init__(self, error, request):
self.error = error
@@ -178,8 +178,8 @@
class HTTPConflictError(object):
interface.implements(IHTTPException)
- component.adapts(zope.webdav.interfaces.IConflictError,
- zope.webdav.interfaces.IHTTPRequest)
+ component.adapts(z3c.dav.interfaces.IConflictError,
+ z3c.dav.interfaces.IHTTPRequest)
def __init__(self, error, request):
self.error = error
@@ -192,8 +192,8 @@
class PreconditionFailed(object):
interface.implements(IHTTPException)
- component.adapts(zope.webdav.interfaces.IPreconditionFailed,
- zope.webdav.interfaces.IHTTPRequest)
+ component.adapts(z3c.dav.interfaces.IPreconditionFailed,
+ z3c.dav.interfaces.IHTTPRequest)
def __init__(self, error, request):
self.error = error
@@ -206,8 +206,8 @@
class HTTPUnsupportedMediaTypeError(object):
interface.implements(IHTTPException)
- component.adapts(zope.webdav.interfaces.IUnsupportedMediaType,
- zope.webdav.interfaces.IHTTPRequest)
+ component.adapts(z3c.dav.interfaces.IUnsupportedMediaType,
+ z3c.dav.interfaces.IHTTPRequest)
def __init__(self, error, request):
self.error = error
@@ -220,8 +220,8 @@
class UnprocessableError(object):
interface.implements(IHTTPException)
- component.adapts(zope.webdav.interfaces.IUnprocessableError,
- zope.webdav.interfaces.IHTTPRequest)
+ component.adapts(z3c.dav.interfaces.IUnprocessableError,
+ z3c.dav.interfaces.IHTTPRequest)
def __init__(self, context, request):
self.context = context
@@ -234,8 +234,8 @@
class BadGateway(object):
interface.implements(IHTTPException)
- component.adapts(zope.webdav.interfaces.IBadGateway,
- zope.webdav.interfaces.IHTTPRequest)
+ component.adapts(z3c.dav.interfaces.IBadGateway,
+ z3c.dav.interfaces.IHTTPRequest)
def __init__(self, error, request):
self.error = error
Modified: z3c.dav/trunk/src/z3c/dav/exceptions/browser.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/exceptions/browser.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/exceptions/browser.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -27,12 +27,12 @@
from zope.app.http.interfaces import IHTTPException
from zope.app.pagetemplate import ViewPageTemplateFile
-import zope.webdav.interfaces
+import z3c.dav.interfaces
class BadRequest(object):
interface.implements(IHTTPException)
- component.adapts(zope.webdav.interfaces.IBadRequest,
- zope.webdav.interfaces.IHTTPRequest)
+ component.adapts(z3c.dav.interfaces.IBadRequest,
+ z3c.dav.interfaces.IHTTPRequest)
def __init__(self, context, request):
self.context = context
Modified: z3c.dav/trunk/src/z3c/dav/exceptions/configure.zcml
===================================================================
--- z3c.dav/trunk/src/z3c/dav/exceptions/configure.zcml 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/exceptions/configure.zcml 2007-05-02 18:42:54 UTC (rev 75023)
@@ -5,156 +5,156 @@
Error widgets
-->
<adapter
- factory="zope.webdav.exceptions.ForbiddenError"
- for="zope.webdav.interfaces.ForbiddenError
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.interfaces.IDAVErrorWidget"
+ factory="z3c.dav.exceptions.ForbiddenError"
+ for="z3c.dav.interfaces.ForbiddenError
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.interfaces.IDAVErrorWidget"
/>
<adapter
- factory="zope.webdav.exceptions.PropertyNotFoundError"
- for="zope.webdav.interfaces.IPropertyNotFound
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.interfaces.IDAVErrorWidget"
+ factory="z3c.dav.exceptions.PropertyNotFoundError"
+ for="z3c.dav.interfaces.IPropertyNotFound
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.interfaces.IDAVErrorWidget"
/>
<adapter
- factory="zope.webdav.exceptions.ConflictError"
+ factory="z3c.dav.exceptions.ConflictError"
for="zope.app.form.interfaces.IWidgetInputError
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.interfaces.IDAVErrorWidget"
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.interfaces.IDAVErrorWidget"
/>
<adapter
- factory="zope.webdav.exceptions.ConflictError"
- for="zope.webdav.interfaces.IConflictError
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.interfaces.IDAVErrorWidget"
+ factory="z3c.dav.exceptions.ConflictError"
+ for="z3c.dav.interfaces.IConflictError
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.interfaces.IDAVErrorWidget"
/>
<adapter
- factory="zope.webdav.exceptions.AlreadyLockedError"
- for="zope.webdav.interfaces.AlreadyLocked
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.interfaces.IDAVErrorWidget"
+ factory="z3c.dav.exceptions.AlreadyLockedError"
+ for="z3c.dav.interfaces.AlreadyLocked
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.interfaces.IDAVErrorWidget"
/>
<adapter
- factory="zope.webdav.exceptions.FailedDependencyError"
- for="zope.webdav.interfaces.IFailedDependency
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.interfaces.IDAVErrorWidget"
+ factory="z3c.dav.exceptions.FailedDependencyError"
+ for="z3c.dav.interfaces.IFailedDependency
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.interfaces.IDAVErrorWidget"
/>
<adapter
- factory="zope.webdav.exceptions.UnauthorizedError"
+ factory="z3c.dav.exceptions.UnauthorizedError"
for="zope.security.interfaces.IUnauthorized
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.interfaces.IDAVErrorWidget"
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.interfaces.IDAVErrorWidget"
/>
<!--
Some default errors that can make it back to the publisher.
-->
<adapter
- factory="zope.webdav.exceptions.UnprocessableError"
+ factory="z3c.dav.exceptions.UnprocessableError"
name="index.html"
/>
<defaultView
- for="zope.webdav.interfaces.IUnprocessableError"
+ for="z3c.dav.interfaces.IUnprocessableError"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
/>
<adapter
- factory="zope.webdav.exceptions.MultiStatusErrorView"
+ factory="z3c.dav.exceptions.MultiStatusErrorView"
name="index.html"
/>
<defaultView
- for="zope.webdav.interfaces.IWebDAVErrors"
- type="zope.webdav.interfaces.IWebDAVRequest"
+ for="z3c.dav.interfaces.IWebDAVErrors"
+ type="z3c.dav.interfaces.IWebDAVRequest"
name="index.html"
/>
<adapter
- factory="zope.webdav.exceptions.WebDAVPropstatErrorView"
+ factory="z3c.dav.exceptions.WebDAVPropstatErrorView"
name="index.html"
/>
<defaultView
- for="zope.webdav.interfaces.IWebDAVPropstatErrors"
- type="zope.webdav.interfaces.IWebDAVRequest"
+ for="z3c.dav.interfaces.IWebDAVPropstatErrors"
+ type="z3c.dav.interfaces.IWebDAVRequest"
name="index.html"
/>
<view
- for="zope.webdav.interfaces.IPreconditionFailed"
+ for="z3c.dav.interfaces.IPreconditionFailed"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
permission="zope.Public"
- factory="zope.webdav.exceptions.PreconditionFailed"
+ factory="z3c.dav.exceptions.PreconditionFailed"
/>
<defaultView
- for="zope.webdav.interfaces.IPreconditionFailed"
+ for="z3c.dav.interfaces.IPreconditionFailed"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
/>
<view
- for="zope.webdav.interfaces.IBadGateway"
+ for="z3c.dav.interfaces.IBadGateway"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
permission="zope.Public"
- factory="zope.webdav.exceptions.BadGateway"
+ factory="z3c.dav.exceptions.BadGateway"
/>
<defaultView
- for="zope.webdav.interfaces.IBadGateway"
+ for="z3c.dav.interfaces.IBadGateway"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
/>
<view
- for="zope.webdav.interfaces.IConflictError"
+ for="z3c.dav.interfaces.IConflictError"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
permission="zope.Public"
- factory="zope.webdav.exceptions.HTTPConflictError"
+ factory="z3c.dav.exceptions.HTTPConflictError"
/>
<defaultView
- for="zope.webdav.interfaces.IConflictError"
+ for="z3c.dav.interfaces.IConflictError"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
/>
<view
- for="zope.webdav.interfaces.IForbiddenError"
+ for="z3c.dav.interfaces.IForbiddenError"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
permission="zope.Public"
- factory="zope.webdav.exceptions.HTTPForbiddenError"
+ factory="z3c.dav.exceptions.HTTPForbiddenError"
/>
<defaultView
- for="zope.webdav.interfaces.IForbiddenError"
+ for="z3c.dav.interfaces.IForbiddenError"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
/>
<view
- for="zope.webdav.interfaces.IUnsupportedMediaType"
+ for="z3c.dav.interfaces.IUnsupportedMediaType"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
permission="zope.Public"
- factory="zope.webdav.exceptions.HTTPUnsupportedMediaTypeError"
+ factory="z3c.dav.exceptions.HTTPUnsupportedMediaTypeError"
/>
<defaultView
- for="zope.webdav.interfaces.IUnsupportedMediaType"
+ for="z3c.dav.interfaces.IUnsupportedMediaType"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
/>
@@ -165,15 +165,15 @@
/>
<view
- for="zope.webdav.interfaces.IBadRequest"
+ for="z3c.dav.interfaces.IBadRequest"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
permission="zope.Public"
- factory="zope.webdav.exceptions.browser.BadRequest"
+ factory="z3c.dav.exceptions.browser.BadRequest"
/>
<defaultView
- for="zope.webdav.interfaces.IBadRequest"
+ for="z3c.dav.interfaces.IBadRequest"
type="zope.publisher.interfaces.http.IHTTPRequest"
name="index.html"
/>
Modified: z3c.dav/trunk/src/z3c/dav/exceptions/ftests/test_baseexceptions.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/exceptions/ftests/test_baseexceptions.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/exceptions/ftests/test_baseexceptions.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -20,18 +20,18 @@
import unittest
from cStringIO import StringIO
-from zope.webdav.ftests import dav
-import zope.webdav.interfaces
-import zope.webdav.exceptions.browser
+from z3c.dav.ftests import dav
+import z3c.dav.interfaces
+import z3c.dav.exceptions.browser
class TestBadRequest(dav.DAVTestCase):
def test_badrequest(self):
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
- error = zope.webdav.interfaces.BadRequest(
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
+ error = z3c.dav.interfaces.BadRequest(
request, u"Some bad content in the request")
- view = zope.webdav.exceptions.browser.BadRequest(error, request)
+ view = z3c.dav.exceptions.browser.BadRequest(error, request)
result = view()
self.assertEqual(request.response.getStatus(), 400)
Modified: z3c.dav/trunk/src/z3c/dav/exceptions/tests/test_multiviews.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/exceptions/tests/test_multiviews.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/exceptions/tests/test_multiviews.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -26,8 +26,8 @@
from zope import component
from zope.traversing.browser.interfaces import IAbsoluteURL
-import zope.webdav.publisher
-from zope.etree.testing import etreeSetup, etreeTearDown, assertXMLEqual
+import z3c.dav.publisher
+from z3c.etree.testing import etreeSetup, etreeTearDown, assertXMLEqual
class IResource(interface.Interface):
@@ -72,7 +72,7 @@
__call__ = __str__
-class TestRequest(zope.webdav.publisher.WebDAVRequest):
+class TestRequest(z3c.dav.publisher.WebDAVRequest):
def __init__(self, properties = None, environ = {}):
if properties is not None:
@@ -104,10 +104,10 @@
gsm = component.getGlobalSiteManager()
gsm.registerAdapter(DummyResourceURL,
- (IResource, zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.exceptions.ForbiddenError,
- (zope.webdav.interfaces.IForbiddenError,
- zope.webdav.interfaces.IWebDAVRequest))
+ (IResource, z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.exceptions.ForbiddenError,
+ (z3c.dav.interfaces.IForbiddenError,
+ z3c.dav.interfaces.IWebDAVRequest))
def tearDown(self):
super(TestPropstatErrorView, self).tearDown()
@@ -117,26 +117,26 @@
gsm = component.getGlobalSiteManager()
gsm.unregisterAdapter(DummyResourceURL,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.exceptions.ForbiddenError,
- (zope.webdav.interfaces.IForbiddenError,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.exceptions.ForbiddenError,
+ (z3c.dav.interfaces.IForbiddenError,
+ z3c.dav.interfaces.IWebDAVRequest))
def test_propstat_interface(self):
resource = Resource()
- error = zope.webdav.interfaces.WebDAVPropstatErrors(resource)
+ error = z3c.dav.interfaces.WebDAVPropstatErrors(resource)
self.assertEqual(
- verifyObject(zope.webdav.interfaces.IWebDAVPropstatErrors, error),
+ verifyObject(z3c.dav.interfaces.IWebDAVPropstatErrors, error),
True)
def test_propstat_simple_errors(self):
resource = Resource()
- error = zope.webdav.interfaces.WebDAVPropstatErrors(resource)
- error["{DAV:}displayname"] = zope.webdav.interfaces.ForbiddenError(
+ error = z3c.dav.interfaces.WebDAVPropstatErrors(resource)
+ error["{DAV:}displayname"] = z3c.dav.interfaces.ForbiddenError(
resource, "{DAV:}displayname", message = u"readonly field")
request = TestRequest()
- view = zope.webdav.exceptions.WebDAVPropstatErrorView(error, request)
+ view = z3c.dav.exceptions.WebDAVPropstatErrorView(error, request)
result = view()
self.assertEqual(request.response.getStatus(), 207)
@@ -162,13 +162,13 @@
gsm = component.getGlobalSiteManager()
gsm.registerAdapter(DummyResourceURL,
- (IResource, zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.exceptions.ForbiddenError,
- (zope.webdav.interfaces.IForbiddenError,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.exceptions.PropertyNotFoundError,
- (zope.webdav.interfaces.IPropertyNotFound,
- zope.webdav.interfaces.IWebDAVRequest))
+ (IResource, z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.exceptions.ForbiddenError,
+ (z3c.dav.interfaces.IForbiddenError,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.exceptions.PropertyNotFoundError,
+ (z3c.dav.interfaces.IPropertyNotFound,
+ z3c.dav.interfaces.IWebDAVRequest))
def tearDown(self):
super(TestMSErrorView, self).tearDown()
@@ -178,28 +178,28 @@
gsm = component.getGlobalSiteManager()
gsm.unregisterAdapter(DummyResourceURL,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.exceptions.ForbiddenError,
- (zope.webdav.interfaces.IForbiddenError,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.exceptions.PropertyNotFoundError,
- (zope.webdav.interfaces.IPropertyNotFound,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.exceptions.ForbiddenError,
+ (z3c.dav.interfaces.IForbiddenError,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.exceptions.PropertyNotFoundError,
+ (z3c.dav.interfaces.IPropertyNotFound,
+ z3c.dav.interfaces.IWebDAVRequest))
def test_multi_resource_error_interface(self):
resource = Resource()
- error = zope.webdav.interfaces.WebDAVErrors(resource)
+ error = z3c.dav.interfaces.WebDAVErrors(resource)
self.assertEqual(
- verifyObject(zope.webdav.interfaces.IWebDAVErrors, error), True)
+ verifyObject(z3c.dav.interfaces.IWebDAVErrors, error), True)
def test_multi_resource_error(self):
resource = Resource()
- error = zope.webdav.interfaces.WebDAVErrors(resource)
- error.append(zope.webdav.interfaces.ForbiddenError(
+ error = z3c.dav.interfaces.WebDAVErrors(resource)
+ error.append(z3c.dav.interfaces.ForbiddenError(
resource, "{DAV:}displayname", message = u"readonly field"))
request = TestRequest()
- view = zope.webdav.exceptions.MultiStatusErrorView(error, request)
+ view = z3c.dav.exceptions.MultiStatusErrorView(error, request)
result = view()
self.assertEqual(request.response.getStatus(), 207)
@@ -216,14 +216,14 @@
resource = Resource()
resource1 = Resource()
resource1.__name__ = "secondresource"
- error = zope.webdav.interfaces.WebDAVErrors(resource)
- error.append(zope.webdav.interfaces.ForbiddenError(
+ error = z3c.dav.interfaces.WebDAVErrors(resource)
+ error.append(z3c.dav.interfaces.ForbiddenError(
resource, "{DAV:}displayname", message = u"readonly field"))
- error.append(zope.webdav.interfaces.PropertyNotFound(
+ error.append(z3c.dav.interfaces.PropertyNotFound(
resource1, "{DAV:}getcontentlength", message = u"readonly field"))
request = TestRequest()
- view = zope.webdav.exceptions.MultiStatusErrorView(error, request)
+ view = z3c.dav.exceptions.MultiStatusErrorView(error, request)
result = view()
self.assertEqual(request.response.getStatus(), 207)
@@ -246,12 +246,12 @@
resource = Resource()
resource1 = Resource()
resource1.__name__ = "secondresource"
- error = zope.webdav.interfaces.WebDAVErrors(resource)
- error.append(zope.webdav.interfaces.PropertyNotFound(
+ error = z3c.dav.interfaces.WebDAVErrors(resource)
+ error.append(z3c.dav.interfaces.PropertyNotFound(
resource1, "{DAV:}getcontentlength", message = u"readonly field"))
request = TestRequest()
- view = zope.webdav.exceptions.MultiStatusErrorView(error, request)
+ view = z3c.dav.exceptions.MultiStatusErrorView(error, request)
result = view()
self.assertEqual(request.response.getStatus(), 207)
Modified: z3c.dav/trunk/src/z3c/dav/exceptions/tests/test_simpleviews.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/exceptions/tests/test_simpleviews.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/exceptions/tests/test_simpleviews.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -24,18 +24,18 @@
from zope import interface
from zope.formlib.namedtemplate import INamedTemplate
-import zope.webdav.interfaces
-import zope.webdav.exceptions
-import zope.webdav.exceptions.browser
-from zope.webdav.publisher import WebDAVRequest
+import z3c.dav.interfaces
+import z3c.dav.exceptions
+import z3c.dav.exceptions.browser
+from z3c.dav.publisher import WebDAVRequest
from test_multiviews import TestRequest
class TestExceptionViews(PlacelessSetup, unittest.TestCase):
def test_unprocessable(self):
request = WebDAVRequest(StringIO(""), {})
- error = zope.webdav.interfaces.UnprocessableError(None)
- view = zope.webdav.exceptions.UnprocessableError(error, request)
+ error = z3c.dav.interfaces.UnprocessableError(None)
+ view = z3c.dav.exceptions.UnprocessableError(error, request)
result = view()
@@ -44,8 +44,8 @@
def test_precondition(self):
request = WebDAVRequest(StringIO(""), {})
- error = zope.webdav.interfaces.PreconditionFailed(None)
- view = zope.webdav.exceptions.PreconditionFailed(error, request)
+ error = z3c.dav.interfaces.PreconditionFailed(None)
+ view = z3c.dav.exceptions.PreconditionFailed(error, request)
result = view()
@@ -54,8 +54,8 @@
def test_badgateway(self):
request = WebDAVRequest(StringIO(""), {})
- error = zope.webdav.interfaces.BadGateway(None, request)
- view = zope.webdav.exceptions.BadGateway(error, request)
+ error = z3c.dav.interfaces.BadGateway(None, request)
+ view = z3c.dav.exceptions.BadGateway(error, request)
result = view()
@@ -64,8 +64,8 @@
def test_conflicterror(self):
request = WebDAVRequest(StringIO(""), {})
- error = zope.webdav.interfaces.ConflictError(None, request)
- view = zope.webdav.exceptions.HTTPConflictError(error, request)
+ error = z3c.dav.interfaces.ConflictError(None, request)
+ view = z3c.dav.exceptions.HTTPConflictError(error, request)
result = view()
@@ -74,8 +74,8 @@
def test_forbiddenerror(self):
request = WebDAVRequest(StringIO(""), {})
- error = zope.webdav.interfaces.ForbiddenError(None, request)
- view = zope.webdav.exceptions.HTTPForbiddenError(error, request)
+ error = z3c.dav.interfaces.ForbiddenError(None, request)
+ view = z3c.dav.exceptions.HTTPForbiddenError(error, request)
result = view()
@@ -84,8 +84,8 @@
def test_unsupportedmediatype(self):
request = WebDAVRequest(StringIO(""), {})
- error = zope.webdav.interfaces.UnsupportedMediaType(None, request)
- view = zope.webdav.exceptions.HTTPUnsupportedMediaTypeError(
+ error = z3c.dav.interfaces.UnsupportedMediaType(None, request)
+ view = z3c.dav.exceptions.HTTPUnsupportedMediaTypeError(
error, request)
result = view()
@@ -97,7 +97,7 @@
class TestDAVErrors(unittest.TestCase):
def test_conflict_error(self):
- errorview = zope.webdav.exceptions.ConflictError(None, None)
+ errorview = z3c.dav.exceptions.ConflictError(None, None)
self.assertEqual(errorview.status, 409)
self.assertEqual(errorview.errors, [])
@@ -105,7 +105,7 @@
self.assertEqual(errorview.responsedescription, "")
def test_forbidden_error(self):
- errorview = zope.webdav.exceptions.ForbiddenError(None, None)
+ errorview = z3c.dav.exceptions.ForbiddenError(None, None)
self.assertEqual(errorview.status, 403)
self.assertEqual(errorview.errors, [])
@@ -113,7 +113,7 @@
self.assertEqual(errorview.responsedescription, "")
def test_propertyNotFound_error(self):
- errorview = zope.webdav.exceptions.PropertyNotFoundError(None, None)
+ errorview = z3c.dav.exceptions.PropertyNotFoundError(None, None)
self.assertEqual(errorview.status, 404)
self.assertEqual(errorview.errors, [])
@@ -121,7 +121,7 @@
self.assertEqual(errorview.responsedescription, "")
def test_failedDependency_error(self):
- errorview = zope.webdav.exceptions.FailedDependencyError(None, None)
+ errorview = z3c.dav.exceptions.FailedDependencyError(None, None)
self.assertEqual(errorview.status, 424)
self.assertEqual(errorview.errors, [])
@@ -129,7 +129,7 @@
self.assertEqual(errorview.responsedescription, "")
def test_alreadlocked_error(self):
- errorview = zope.webdav.exceptions.AlreadyLockedError(None, None)
+ errorview = z3c.dav.exceptions.AlreadyLockedError(None, None)
self.assertEqual(errorview.status, 423)
self.assertEqual(errorview.errors, [])
@@ -137,7 +137,7 @@
self.assertEqual(errorview.responsedescription, "")
def test_unauthorized_error(self):
- errorview = zope.webdav.exceptions.UnauthorizedError(None, None)
+ errorview = z3c.dav.exceptions.UnauthorizedError(None, None)
self.assertEqual(errorview.status, 401)
self.assertEqual(errorview.errors, [])
@@ -150,7 +150,7 @@
def __init__(self, context):
self.context = context
- component.adapts(zope.webdav.exceptions.browser.BadRequest)
+ component.adapts(z3c.dav.exceptions.browser.BadRequest)
interface.implements(INamedTemplate)
def __call__(self):
@@ -168,20 +168,20 @@
DummyTemplate, name = "default")
def test_badrequestView(self):
- error = zope.webdav.interfaces.BadRequest(
+ error = z3c.dav.interfaces.BadRequest(
None, message = u"Bad request data")
request = TestRequest()
- view = zope.webdav.exceptions.browser.BadRequest(error, request)
+ view = z3c.dav.exceptions.browser.BadRequest(error, request)
result = view()
self.assertEqual(request.response.getStatus(), 400)
self.assertEqual(result, "Errr... bad request")
def test_badrequestView_message(self):
- error = zope.webdav.interfaces.BadRequest(
+ error = z3c.dav.interfaces.BadRequest(
None, message = u"Bad request data")
request = TestRequest()
- view = zope.webdav.exceptions.browser.BadRequest(error, request)
+ view = z3c.dav.exceptions.browser.BadRequest(error, request)
self.assertEqual(view.message(), "Bad request data")
Modified: z3c.dav/trunk/src/z3c/dav/ftests/__init__.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/ftests/__init__.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/ftests/__init__.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Collection of functional tests for zope.webdav
+"""Collection of functional tests for z3c.dav
$Id$
"""
Modified: z3c.dav/trunk/src/z3c/dav/ftests/dav.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/ftests/dav.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/ftests/dav.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -38,11 +38,11 @@
from zope.security.testing import Principal, Participation
from zope.dublincore.interfaces import IWriteZopeDublinCore
-from zope.webdav.publisher import WebDAVRequest
-from zope.webdav.properties import DAVProperty
-from zope.etree.interfaces import IEtree
-import zope.etree.testing
-from zope.webdav.tests.utils import TestMultiStatusBody
+import z3c.etree
+import z3c.etree.testing
+from z3c.dav.publisher import WebDAVRequest
+from z3c.dav.properties import DAVProperty
+from z3c.dav.tests.utils import TestMultiStatusBody
class WebDAVLayerClass(zope.app.testing.functional.ZCMLLayer):
@@ -51,11 +51,11 @@
def setUp(self):
zope.app.testing.functional.ZCMLLayer.setUp(self)
- zope.etree.testing.etreeSetup()
+ z3c.etree.testing.etreeSetup()
def tearDown(self):
zope.app.testing.functional.ZCMLLayer.tearDown(self)
- zope.etree.testing.etreeTearDown()
+ z3c.etree.testing.etreeTearDown()
here = os.path.dirname(os.path.realpath(__file__))
WebDAVLayer = WebDAVLayerClass(
@@ -264,7 +264,7 @@
self.assertEqual(response.getHeader("content-type"), "application/xml")
respbody = response.getBody()
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
xmlbody = etree.fromstring(respbody)
return response, xmlbody
@@ -309,7 +309,7 @@
self.assertEqual(response.getHeader("content-type"), "application/xml")
respbody = response.getBody()
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
xmlbody = etree.fromstring(respbody)
return response, xmlbody
Modified: z3c.dav/trunk/src/z3c/dav/ftests/ftesting-locking.zcml
===================================================================
--- z3c.dav/trunk/src/z3c/dav/ftests/ftesting-locking.zcml 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/ftests/ftesting-locking.zcml 2007-05-02 18:42:54 UTC (rev 75023)
@@ -1,6 +1,6 @@
<configure xmlns="http://namespaces.zope.org/zope">
- <include package="zope.webdav.ftests" file="ftesting.zcml" />
+ <include package="z3c.dav.ftests" file="ftesting.zcml" />
<include package="zope.app.keyreference" />
<include package="zope.locking" />
Modified: z3c.dav/trunk/src/z3c/dav/ftests/ftesting.zcml
===================================================================
--- z3c.dav/trunk/src/z3c/dav/ftests/ftesting.zcml 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/ftests/ftesting.zcml 2007-05-02 18:42:54 UTC (rev 75023)
@@ -45,12 +45,12 @@
<include package="zope.app.authentication" />
- <include package="zope.webdav" />
+ <include package="z3c.dav" />
<!-- This is usually how we register the elementtree engine to use within
our application but for testing purposes we use the .dav.WebDAVLayerClass
<utility
- factory="zope.etree.etree.EtreeEtree"
+ factory="z3c.etree.etree.EtreeEtree"
/>
-->
@@ -62,27 +62,27 @@
-->
<utility
name="{DAVtest:}unauthprop"
- component="zope.webdav.tests.test_proppatch.unauthProperty"
+ component="z3c.dav.tests.test_proppatch.unauthProperty"
/>
<adapter
- factory="zope.webdav.tests.test_proppatch.UnauthorizedPropertyStorage"
+ factory="z3c.dav.tests.test_proppatch.UnauthorizedPropertyStorage"
for="zope.interface.Interface
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.tests.test_proppatch.IUnauthorizedPropertyStorage"
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.tests.test_proppatch.IUnauthorizedPropertyStorage"
/>
<utility
name="{DAVtest:}exampletextprop"
- component="zope.webdav.ftests.dav.exampleTextProperty"
+ component="z3c.dav.ftests.dav.exampleTextProperty"
/>
<utility
name="{DAVtest:}exampleintprop"
- component="zope.webdav.ftests.dav.exampleIntProperty"
+ component="z3c.dav.ftests.dav.exampleIntProperty"
/>
<adapter
- factory="zope.webdav.ftests.dav.ExamplePropertyStorage"
+ factory="z3c.dav.ftests.dav.ExamplePropertyStorage"
for="zope.interface.Interface
- zope.webdav.interfaces.IWebDAVRequest"
+ z3c.dav.interfaces.IWebDAVRequest"
/>
</configure>
Modified: z3c.dav/trunk/src/z3c/dav/ftests/test_propfind.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/ftests/test_propfind.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/ftests/test_propfind.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Collection of functional tests for PROPFIND zope.webdav
+"""Collection of functional tests for PROPFIND z3c.dav
$Id$
"""
@@ -23,7 +23,7 @@
import dav
from zope import component
-import zope.webdav.interfaces
+import z3c.dav.interfaces
class PROPFINDTests(dav.DAVTestCase):
@@ -308,7 +308,7 @@
file = self.addResource("/r", "some file content",
title = u"Test resource")
- opaqueProperties = zope.webdav.interfaces.IOpaquePropertyStorage(file)
+ opaqueProperties = z3c.dav.interfaces.IOpaquePropertyStorage(file)
opaqueProperties.setProperty(
"{examplens:}testdeadprop",
"""<E:testdeadprop xmlns:E="examplens:">TEST</E:testdeadprop>""")
@@ -342,7 +342,7 @@
file = self.addResource("/r", "some file content",
title = u"Test Resource")
- opaqueProperties = zope.webdav.interfaces.IOpaquePropertyStorage(file)
+ opaqueProperties = z3c.dav.interfaces.IOpaquePropertyStorage(file)
opaqueProperties.setProperty(
"{examplens:}testdeadprop",
"""<E:testdeadprop xmlns:E="examplens:">TEST</E:testdeadprop>""")
@@ -372,7 +372,7 @@
def test_allprop_with_deadprops(self):
file = self.addResource("/r", "some content", title = u"Test Resource")
- opaqueProperties = zope.webdav.interfaces.IOpaquePropertyStorage(file)
+ opaqueProperties = z3c.dav.interfaces.IOpaquePropertyStorage(file)
opaqueProperties.setProperty("{deadprop:}deadprop",
"""<X:deadprop xmlns:X="deadprop:">
This is a dead property.</X:deadprop>""")
@@ -421,7 +421,7 @@
examplePropStorage.exampletextprop = "EXAMPLE TEXT PROP"
transaction.commit()
- textprop = component.getUtility(zope.webdav.interfaces.IDAVProperty,
+ textprop = component.getUtility(z3c.dav.interfaces.IDAVProperty,
name = "{DAVtest:}exampletextprop")
textprop.restricted = True
Modified: z3c.dav/trunk/src/z3c/dav/ftests/test_proppatch.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/ftests/test_proppatch.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/ftests/test_proppatch.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Collection of functional tests for PROPFIND zope.webdav
+"""Collection of functional tests for PROPFIND z3c.dav
$Id$
"""
@@ -25,9 +25,9 @@
import dav
-import zope.webdav.interfaces
-from zope.webdav.publisher import WebDAVRequest
-from zope.etree.testing import assertXMLEqual
+import z3c.dav.interfaces
+from z3c.dav.publisher import WebDAVRequest
+from z3c.etree.testing import assertXMLEqual
class PROPPATCHTestCase(dav.DAVTestCase):
@@ -176,7 +176,7 @@
httpresponse, xmlbody = self.checkProppatch(
"/r", basic = "mgr:mgrpw", set_properties = set_properties)
- opaqueProperties = zope.webdav.interfaces.IOpaquePropertyStorage(file)
+ opaqueProperties = z3c.dav.interfaces.IOpaquePropertyStorage(file)
self.assertEqual(opaqueProperties.hasProperty(
"{http://ns.example.com/z39.50/}Author"), True)
assertXMLEqual(opaqueProperties.getProperty(
@@ -197,7 +197,7 @@
httpresponse, xmlbody = self.checkProppatch(
"/r", basic = "mgr:mgrpw", set_properties = set_properties)
- opaqueProperties = zope.webdav.interfaces.IOpaquePropertyStorage(file)
+ opaqueProperties = z3c.dav.interfaces.IOpaquePropertyStorage(file)
allprops = [tag for tag in opaqueProperties.getAllProperties()]
allprops.sort()
self.assertEqual(allprops, ["{example:}prop0", "{example:}prop1",
@@ -220,7 +220,7 @@
def test_remove_live_prop(self):
file = self.addResource("/r", "some content", title = u"Test Resource")
- opaqueProperties = zope.webdav.interfaces.IOpaquePropertyStorage(file)
+ opaqueProperties = z3c.dav.interfaces.IOpaquePropertyStorage(file)
opaqueProperties.setProperty("{deadprop:}deadprop",
"""<X:deadprop xmlns:X="deadprop:">
This is a dead property.</X:deadprop>""")
@@ -255,7 +255,7 @@
proptag = "{deadprop:}deadprop"
file = self.addResource("/r", "some content", title = u"Test Resource")
- opaqueProperties = zope.webdav.interfaces.IOpaquePropertyStorage(file)
+ opaqueProperties = z3c.dav.interfaces.IOpaquePropertyStorage(file)
opaqueProperties.setProperty(proptag,
"""<X:deadprop xmlns:X="deadprop:">
This is a dead property.</X:deadprop>""")
@@ -271,7 +271,7 @@
self.assertMSPropertyValue(response, proptag)
- opaqueProperties = zope.webdav.interfaces.IOpaquePropertyStorage(file)
+ opaqueProperties = z3c.dav.interfaces.IOpaquePropertyStorage(file)
self.assertEqual(opaqueProperties.hasProperty(proptag), False)
def test_setting_unicode_title(self):
Modified: z3c.dav/trunk/src/z3c/dav/ftests/test_z3_locking.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/ftests/test_z3_locking.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/ftests/test_z3_locking.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -23,7 +23,7 @@
from cStringIO import StringIO
import os.path
-import zope.webdav.ftests.dav
+import z3c.dav.ftests.dav
from zope import component
from zope.app.publication.http import MethodNotAllowed
@@ -34,17 +34,17 @@
import zope.locking.utils
from zope.security.interfaces import Unauthorized
-from zope.webdav.interfaces import IDAVLockmanager
-import zope.webdav.publisher
-from zope.etree.interfaces import IEtree
-from zope.etree.testing import assertXMLEqual
+from z3c.dav.interfaces import IDAVLockmanager
+import z3c.dav.publisher
+import z3c.etree
+from z3c.etree.testing import assertXMLEqual
here = os.path.dirname(os.path.realpath(__file__))
-WebDAVLockingLayer = zope.webdav.ftests.dav.WebDAVLayerClass(
+WebDAVLockingLayer = z3c.dav.ftests.dav.WebDAVLayerClass(
os.path.join(here, "ftesting-locking.zcml"), __name__, "WebDAVLockingLayer")
-class LOCKNotAllowedTestCase(zope.webdav.ftests.dav.DAVTestCase):
+class LOCKNotAllowedTestCase(z3c.dav.ftests.dav.DAVTestCase):
layer = WebDAVLockingLayer
@@ -86,12 +86,12 @@
status = 404)
-class LOCKTestCase(zope.webdav.ftests.dav.DAVTestCase):
+class LOCKTestCase(z3c.dav.ftests.dav.DAVTestCase):
layer = WebDAVLockingLayer
def _setup(self):
- zope.webdav.ftests.dav.DAVTestCase.setUp(self)
+ z3c.dav.ftests.dav.DAVTestCase.setUp(self)
self.oldnow = zope.locking.utils.now
def now():
@@ -111,7 +111,7 @@
zope.locking.utils.now = self.oldnow
del self.oldnow
- zope.webdav.ftests.dav.DAVTestCase.tearDown(self)
+ z3c.dav.ftests.dav.DAVTestCase.tearDown(self)
def tearDown(self):
self._teardown()
@@ -303,11 +303,11 @@
token = self.utility.get(self.getRootFolder())
self.assertEqual(
- token.annotations["zope.webdav.lockingutils.info"]["token"],
+ token.annotations["z3c.dav.lockingutils.info"]["token"],
locktoken)
token = self.utility.get(self.getRootFolder()["a"])
self.assertEqual(
- token.annotations["zope.webdav.lockingutils.info"]["token"],
+ token.annotations["z3c.dav.lockingutils.info"]["token"],
locktoken)
root = self.getRootFolder()
@@ -317,7 +317,7 @@
IDAVLockmanager(root["a"]["r2"]).getActivelock().locktoken[0],
locktoken)
- request = zope.webdav.publisher.WebDAVRequest(
+ request = z3c.dav.publisher.WebDAVRequest(
StringIO(""), {"HTTP_HOST": "localhost"})
lockroot = IDAVLockmanager(root).getActivelock(request).lockroot
@@ -355,7 +355,7 @@
request_body = body,
handle_errors = True)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
xmlbody = etree.fromstring(httpresponse.getBody())
self.assertEqual(httpresponse.getStatus(), 207)
@@ -498,7 +498,7 @@
rootfolder = self.getRootFolder()["a"]
subresource = rootfolder["r2"]
- request = zope.webdav.publisher.WebDAVRequest(
+ request = z3c.dav.publisher.WebDAVRequest(
StringIO(""), {"HTTP_HOST": "localhost"})
lockmanager = IDAVLockmanager(rootfolder)
@@ -623,7 +623,7 @@
self.assertEqual(response.getStatus(), 412)
-class UNLOCKTestCase(zope.webdav.ftests.dav.DAVTestCase):
+class UNLOCKTestCase(z3c.dav.ftests.dav.DAVTestCase):
layer = WebDAVLockingLayer
Modified: z3c.dav/trunk/src/z3c/dav/interfaces.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/interfaces.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/interfaces.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -537,7 +537,7 @@
Return False when the current context can never be locked or locking
is not support in your setup.
- For example in Zope3, zope.webdav.lockingutils.DAVLockmanager depends
+ For example in Zope3, z3c.dav.lockingutils.DAVLockmanager depends
on a persistent zope.locking.interfaces.ITokenUtility utility being
present and registered. If this utility can not be locked be then
we can never use this implementation of IDAVLockmanager.
Modified: z3c.dav/trunk/src/z3c/dav/locking.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/locking.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/locking.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -44,11 +44,11 @@
from zope import component
from zope import interface
-import zope.webdav.interfaces
-import zope.webdav.properties
-from zope.webdav.coreproperties import IActiveLock, IDAVSupportedlock
-from zope.etree.interfaces import IEtree
-import zope.webdav.utils
+import z3c.etree
+import z3c.dav.interfaces
+import z3c.dav.properties
+from z3c.dav.coreproperties import IActiveLock, IDAVSupportedlock
+import z3c.dav.utils
MAXTIMEOUT = (2L ** 32) - 1
DEFAULTTIMEOUT = 12 * 60L
@@ -76,14 +76,14 @@
return None
- at component.adapter(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
- at interface.implementer(zope.webdav.interfaces.IWebDAVMethod)
+ at component.adapter(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
+ at interface.implementer(z3c.dav.interfaces.IWebDAVMethod)
def LOCK(context, request):
"""
If we can adapt the context to a lock manager then we should be able to
lock the resource.
"""
- lockmanager = zope.webdav.interfaces.IDAVLockmanager(context, None)
+ lockmanager = z3c.dav.interfaces.IDAVLockmanager(context, None)
if lockmanager is None:
return None
if not lockmanager.islockable():
@@ -96,8 +96,8 @@
"""
LOCK handler for all objects.
"""
- interface.implements(zope.webdav.interfaces.IWebDAVMethod)
- component.adapts(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
+ interface.implements(z3c.dav.interfaces.IWebDAVMethod)
+ component.adapts(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
def __init__(self, context, request):
self.context = context
@@ -205,7 +205,7 @@
elif len(t) == 1 and (t[0] == "infinite" or t[0] == "infinity"):
th = t[0]
else:
- raise zope.webdav.interfaces.BadRequest(
+ raise z3c.dav.interfaces.BadRequest(
self.request, message = u"Invalid TIMEOUT header")
if th == "infinite" or th == "infinite" or th == "infinity":
@@ -214,7 +214,7 @@
try:
timeout = long(th)
except ValueError:
- raise zope.webdav.interfaces.BadRequest(
+ raise z3c.dav.interfaces.BadRequest(
self.request, message = u"Invalid TIMEOUT header")
if timeout is not None and timeout < MAXTIMEOUT:
@@ -248,7 +248,7 @@
"""
depth = self.request.getHeader("depth", "infinity")
if depth not in ("0", "infinity"):
- raise zope.webdav.interfaces.BadRequest(
+ raise z3c.dav.interfaces.BadRequest(
self.request,
u"Invalid depth header. Must be either '0' or 'infinity'")
@@ -266,13 +266,13 @@
errors = self.handleLock()
if errors:
- raise zope.webdav.interfaces.WebDAVErrors(self.context, errors)
+ raise z3c.dav.interfaces.WebDAVErrors(self.context, errors)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
- davprop, adapter = zope.webdav.properties.getProperty(
+ davprop, adapter = z3c.dav.properties.getProperty(
self.context, self.request, "{DAV:}lockdiscovery")
- davwidget = zope.webdav.properties.getWidget(
+ davwidget = z3c.dav.properties.getWidget(
davprop, adapter, self.request)
propel = etree.Element(etree.QName("DAV:", "prop"))
propel.append(davwidget.render())
@@ -289,10 +289,10 @@
return etree.tostring(propel)
def handleLockRefresh(self):
- lockmanager = zope.webdav.interfaces.IDAVLockmanager(self.context)
+ lockmanager = z3c.dav.interfaces.IDAVLockmanager(self.context)
if not lockmanager.islocked():
- raise zope.webdav.interfaces.PreconditionFailed(
+ raise z3c.dav.interfaces.PreconditionFailed(
self.context, message = u"Context is not locked.")
locktoken = component.getMultiAdapter((self.context, self.request),
@@ -301,7 +301,7 @@
if not request_uri or \
request_uri[0] != "<" or request_uri[-1] != ">" or \
request_uri[1:-1] != locktoken:
- raise zope.webdav.interfaces.PreconditionFailed(
+ raise z3c.dav.interfaces.PreconditionFailed(
self.context, message = u"Lock-Token doesn't match request uri")
timeout = self.getTimeout()
@@ -312,7 +312,7 @@
xmlsource = self.request.xmlDataSource
if xmlsource.tag != "{DAV:}lockinfo":
- raise zope.webdav.interfaces.UnprocessableError(
+ raise z3c.dav.interfaces.UnprocessableError(
self.context,
message = u"LOCK request body must be a `lockinfo' XML element")
@@ -320,21 +320,21 @@
depth = self.getDepth()
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
lockscope = xmlsource.find("{DAV:}lockscope")
if not lockscope:
- raise zope.webdav.interfaces.UnprocessableError(
+ raise z3c.dav.interfaces.UnprocessableError(
self.context,
message = u"No `{DAV:}lockscope' XML element in request")
- lockscope_str = zope.webdav.utils.parseEtreeTag(lockscope[0].tag)[1]
+ lockscope_str = z3c.dav.utils.parseEtreeTag(lockscope[0].tag)[1]
locktype = xmlsource.find("{DAV:}locktype")
if not locktype:
- raise zope.webdav.interfaces.UnprocessableError(
+ raise z3c.dav.interfaces.UnprocessableError(
self.context,
message = u"No `{DAV:}locktype' XML element in request")
- locktype_str = zope.webdav.utils.parseEtreeTag(locktype[0].tag)[1]
+ locktype_str = z3c.dav.utils.parseEtreeTag(locktype[0].tag)[1]
supportedlocks = component.getMultiAdapter(
(self.context, self.request), IDAVSupportedlock)
@@ -343,7 +343,7 @@
entry.lockscope[0] == lockscope_str:
break
else:
- raise zope.webdav.interfaces.UnprocessableError(
+ raise z3c.dav.interfaces.UnprocessableError(
self.context,
message = u"Unknown lock-token requested.")
@@ -353,7 +353,7 @@
else:
owner_str = None
- lockmanager = zope.webdav.interfaces.IDAVLockmanager(self.context)
+ lockmanager = z3c.dav.interfaces.IDAVLockmanager(self.context)
try:
lockmanager.lock(scope = lockscope_str,
@@ -361,7 +361,7 @@
owner = owner_str,
duration = timeout,
depth = depth)
- except zope.webdav.interfaces.AlreadyLocked, error:
+ except z3c.dav.interfaces.AlreadyLocked, error:
errors.append(error)
return errors
@@ -372,14 +372,14 @@
#
################################################################################
- at component.adapter(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
- at interface.implementer(zope.webdav.interfaces.IWebDAVMethod)
+ at component.adapter(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
+ at interface.implementer(z3c.dav.interfaces.IWebDAVMethod)
def UNLOCK(context, request):
"""
If we can adapt the context to a lock manager then we should be able to
unlock the resource.
"""
- lockmanager = zope.webdav.interfaces.IDAVLockmanager(context, None)
+ lockmanager = z3c.dav.interfaces.IDAVLockmanager(context, None)
if lockmanager is None:
return None
if not lockmanager.islockable():
@@ -392,8 +392,8 @@
"""
UNLOCK handler for all objects.
"""
- interface.implements(zope.webdav.interfaces.IWebDAVMethod)
- component.adapts(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
+ interface.implements(z3c.dav.interfaces.IWebDAVMethod)
+ component.adapts(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
def __init__(self, context, request):
self.context = context
@@ -405,14 +405,14 @@
locktoken = locktoken[1:-1]
if not locktoken:
- raise zope.webdav.interfaces.BadRequest(
+ raise z3c.dav.interfaces.BadRequest(
self.request, message = u"No lock-token header supplied")
- lockmanager = zope.webdav.interfaces.IDAVLockmanager(self.context)
+ lockmanager = z3c.dav.interfaces.IDAVLockmanager(self.context)
activelock = component.getMultiAdapter((self.context, self.request),
IActiveLock)
if not lockmanager.islocked() or activelock.locktoken[0] != locktoken:
- raise zope.webdav.interfaces.ConflictError(
+ raise z3c.dav.interfaces.ConflictError(
self.context, message = "object is locked or the lock isn't" \
" in the scope the passed.")
Modified: z3c.dav/trunk/src/z3c/dav/locking.txt
===================================================================
--- z3c.dav/trunk/src/z3c/dav/locking.txt 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/locking.txt 2007-05-02 18:42:54 UTC (rev 75023)
@@ -2,12 +2,12 @@
WebDAV locking
==============
-zope.webdav.locking doesn't fully implement the WebDAV LOCK and UNLOCK methods.
+z3c.dav.locking doesn't fully implement the WebDAV LOCK and UNLOCK methods.
Instead it tries to hide most of the protocols details from developers and
provide a way for developers to integrate the WebDAV LOCK and UNLOCK methods
with different locking mechanisms. This is mainly done by an implementation
-of the zope.webdav.interfaces.IDAVLockmanager adapter. The
-zope.webdav.lockingutils module uses the zope.locking package to integrate
+of the z3c.dav.interfaces.IDAVLockmanager adapter. The
+z3c.dav.lockingutils module uses the zope.locking package to integrate
the zope.locking with the LOCK and UNLOCK methods.
This test will define a very simple locking mechanism that will show what
@@ -24,12 +24,12 @@
>>> from zope.interface.verify import verifyObject
>>> import zope.component
>>> import zope.app.container.interfaces
- >>> import zope.webdav.interfaces
+ >>> import z3c.dav.interfaces
Define a test request object and a content type against which to run the
tests.
- >>> class TestWebDAVRequest(zope.webdav.publisher.WebDAVRequest):
+ >>> class TestWebDAVRequest(z3c.dav.publisher.WebDAVRequest):
... def __init__(self, lockinfo = {}, body = "", environ = {}):
... env = environ.copy()
... if body:
@@ -50,21 +50,21 @@
LOCK Method
===========
- >>> from zope.webdav.locking import LOCK
+ >>> from z3c.dav.locking import LOCK
The LOCK method is only defined when the current resource is adaptable to
-`zope.webdav.interfaces.IDAVLockManager`.
+`z3c.dav.interfaces.IDAVLockManager`.
>>> LOCK(Resource(), TestWebDAVRequest()) is None
True
-Implement the zope.webdav.interfaces.IDAVLockmanager adapter. When the
+Implement the z3c.dav.interfaces.IDAVLockmanager adapter. When the
lock, refreshlock, and unlock methods are called by the LOCK / UNLOCK methods
below then these methods will print out a simple unique message that we
can test for.
>>> class DAVLockmanager(object):
- ... zope.interface.implements(zope.webdav.interfaces.IDAVLockmanager)
+ ... zope.interface.implements(z3c.dav.interfaces.IDAVLockmanager)
... zope.component.adapts(IResource)
... _islockable = True
... def __init__(self, context):
@@ -78,7 +78,7 @@
... print "Refreshed lock token."
... def lock(self, scope, type, owner, duration, depth):
... if self.context._lockinfo is not None:
- ... raise zope.webdav.interfaces.AlreadyLocked(self.context)
+ ... raise z3c.dav.interfaces.AlreadyLocked(self.context)
... self.context._lockinfo = {'scope': scope,
... 'type': type,
... 'owner': owner,
@@ -89,13 +89,13 @@
... self.context._lockinfo = None
... print "Unlocked the resource."
- >>> verifyObject(zope.webdav.interfaces.IDAVLockmanager,
+ >>> verifyObject(z3c.dav.interfaces.IDAVLockmanager,
... DAVLockmanager(Resource()))
True
>>> gsm.registerAdapter(DAVLockmanager)
>>> LOCK(Resource(), TestWebDAVRequest()) #doctest:+ELLIPSIS
- <zope.webdav.locking.LOCKMethod object at 0x...>
+ <z3c.dav.locking.LOCKMethod object at 0x...>
In some locking implementations the lockmanager can say that a resource can
not be locked - ever. This is when the islockable method returns False. In
@@ -160,13 +160,13 @@
supports.
>>> class Exclusivelock(object):
- ... zope.interface.implements(zope.webdav.coreproperties.ILockEntry)
+ ... zope.interface.implements(z3c.dav.coreproperties.ILockEntry)
... lockscope = [u"exclusive"]
... locktype = [u"write"]
>>> class Supportedlock(object):
- ... zope.interface.implements(zope.webdav.coreproperties.IDAVSupportedlock)
- ... zope.component.adapts(IResource, zope.webdav.interfaces.IWebDAVRequest)
+ ... zope.interface.implements(z3c.dav.coreproperties.IDAVSupportedlock)
+ ... zope.component.adapts(IResource, z3c.dav.interfaces.IWebDAVRequest)
... def __init__(self, context, request):
... pass
... @property
@@ -269,7 +269,7 @@
'0'
Now if the resource is already locked then the `handleLock` returns an
-`zope.webdav.interfaces.AlreadyLocked` error.
+`z3c.dav.interfaces.AlreadyLocked` error.
>>> errors = LOCK(resource, TestWebDAVRequest(
... body = """<?xml version="1.0" encoding="utf-8" ?>
@@ -281,13 +281,13 @@
... </D:owner>
... </D:lockinfo>""")).handleLock()
>>> errors #doctest:+ELLIPSIS
- [<zope.webdav.interfaces.AlreadyLocked instance at ...>]
+ [<z3c.dav.interfaces.AlreadyLocked instance at ...>]
LOCK
----
The LOCK method will wrap any AlreadyLockedErrors in a
-`zope.webdav.interfaces.WebDAVErrors` containing exception. The logic behind
+`z3c.dav.interfaces.WebDAVErrors` containing exception. The logic behind
this is to make it easier write a view of the error.
>>> LOCK(resource, TestWebDAVRequest(
@@ -335,8 +335,8 @@
True
>>> class Activelock(object):
- ... zope.interface.implements(zope.webdav.coreproperties.IActiveLock)
- ... zope.component.adapts(IResource, zope.webdav.interfaces.IWebDAVRequest)
+ ... zope.interface.implements(z3c.dav.coreproperties.IActiveLock)
+ ... zope.component.adapts(IResource, z3c.dav.interfaces.IWebDAVRequest)
... def __init__(self, context, request):
... self.context = context
... self.data = context._lockinfo
@@ -369,14 +369,14 @@
... def locktoken(self):
... return self._locktoken
- >>> verifyObject(zope.webdav.coreproperties.IActiveLock,
+ >>> verifyObject(z3c.dav.coreproperties.IActiveLock,
... Activelock(resource, None))
True
>>> gsm.registerAdapter(Activelock)
>>> class Lockdiscovery(object):
- ... zope.interface.implements(zope.webdav.coreproperties.IDAVLockdiscovery)
- ... zope.component.adapts(IResource, zope.webdav.interfaces.IWebDAVRequest)
+ ... zope.interface.implements(z3c.dav.coreproperties.IDAVLockdiscovery)
+ ... zope.component.adapts(IResource, z3c.dav.interfaces.IWebDAVRequest)
... def __init__(self, context, request):
... self.context, self.request = context, request
... @property
@@ -386,23 +386,23 @@
We need the following setup in-order for the LOCK method to render the
`{DAV:}lockdiscovery` widget.
- >>> gsm.registerAdapter(zope.webdav.widgets.ListDAVWidget,
+ >>> gsm.registerAdapter(z3c.dav.widgets.ListDAVWidget,
... (zope.schema.interfaces.IList,
- ... zope.webdav.interfaces.IWebDAVRequest))
- >>> gsm.registerAdapter(zope.webdav.widgets.ObjectDAVWidget,
+ ... z3c.dav.interfaces.IWebDAVRequest))
+ >>> gsm.registerAdapter(z3c.dav.widgets.ObjectDAVWidget,
... (zope.schema.interfaces.IObject,
- ... zope.webdav.interfaces.IWebDAVRequest))
- >>> gsm.registerAdapter(zope.webdav.widgets.TextDAVWidget,
+ ... z3c.dav.interfaces.IWebDAVRequest))
+ >>> gsm.registerAdapter(z3c.dav.widgets.TextDAVWidget,
... (zope.schema.interfaces.IText,
- ... zope.webdav.interfaces.IWebDAVRequest))
- >>> gsm.registerAdapter(zope.webdav.properties.OpaqueWidget,
- ... (zope.webdav.properties.DeadField,
- ... zope.webdav.interfaces.IWebDAVRequest))
- >>> gsm.registerAdapter(zope.webdav.widgets.TextDAVWidget,
+ ... z3c.dav.interfaces.IWebDAVRequest))
+ >>> gsm.registerAdapter(z3c.dav.properties.OpaqueWidget,
+ ... (z3c.dav.properties.DeadField,
+ ... z3c.dav.interfaces.IWebDAVRequest))
+ >>> gsm.registerAdapter(z3c.dav.widgets.TextDAVWidget,
... (zope.schema.interfaces.IURI,
- ... zope.webdav.interfaces.IWebDAVRequest))
+ ... z3c.dav.interfaces.IWebDAVRequest))
- >>> gsm.registerUtility(zope.webdav.coreproperties.lockdiscovery,
+ >>> gsm.registerUtility(z3c.dav.coreproperties.lockdiscovery,
... name = "{DAV:}lockdiscovery")
>>> gsm.registerAdapter(Lockdiscovery)
@@ -451,9 +451,9 @@
data can be known. This is handy information if you are implementing a custom
lock mechanism.
- >>> davprop, adapter = zope.webdav.properties.getProperty(
+ >>> davprop, adapter = z3c.dav.properties.getProperty(
... resource, request, '{DAV:}lockdiscovery')
- >>> davwidget = zope.webdav.properties.getWidget(davprop, adapter, request)
+ >>> davwidget = z3c.dav.properties.getWidget(davprop, adapter, request)
>>> resource._lockinfo['duration'] = None
>>> Activelock._locktoken = None
@@ -653,7 +653,7 @@
UNLOCK Method
=============
- >>> from zope.webdav.locking import UNLOCK
+ >>> from z3c.dav.locking import UNLOCK
Re-lock the resource which just got unlocked.
@@ -741,28 +741,28 @@
>>> gsm.unregisterAdapter(Activelock)
True
- >>> gsm.unregisterAdapter(zope.webdav.widgets.ListDAVWidget,
+ >>> gsm.unregisterAdapter(z3c.dav.widgets.ListDAVWidget,
... (zope.schema.interfaces.IList,
- ... zope.webdav.interfaces.IWebDAVRequest))
+ ... z3c.dav.interfaces.IWebDAVRequest))
True
- >>> gsm.unregisterAdapter(zope.webdav.widgets.ObjectDAVWidget,
+ >>> gsm.unregisterAdapter(z3c.dav.widgets.ObjectDAVWidget,
... (zope.schema.interfaces.IObject,
- ... zope.webdav.interfaces.IWebDAVRequest))
+ ... z3c.dav.interfaces.IWebDAVRequest))
True
- >>> gsm.unregisterAdapter(zope.webdav.widgets.TextDAVWidget,
+ >>> gsm.unregisterAdapter(z3c.dav.widgets.TextDAVWidget,
... (zope.schema.interfaces.IText,
- ... zope.webdav.interfaces.IWebDAVRequest))
+ ... z3c.dav.interfaces.IWebDAVRequest))
True
- >>> gsm.unregisterAdapter(zope.webdav.properties.OpaqueWidget,
- ... (zope.webdav.properties.DeadField,
- ... zope.webdav.interfaces.IWebDAVRequest))
+ >>> gsm.unregisterAdapter(z3c.dav.properties.OpaqueWidget,
+ ... (z3c.dav.properties.DeadField,
+ ... z3c.dav.interfaces.IWebDAVRequest))
True
- >>> gsm.unregisterAdapter(zope.webdav.widgets.TextDAVWidget,
+ >>> gsm.unregisterAdapter(z3c.dav.widgets.TextDAVWidget,
... (zope.schema.interfaces.IURI,
- ... zope.webdav.interfaces.IWebDAVRequest))
+ ... z3c.dav.interfaces.IWebDAVRequest))
True
- >>> gsm.unregisterUtility(zope.webdav.coreproperties.lockdiscovery,
+ >>> gsm.unregisterUtility(z3c.dav.coreproperties.lockdiscovery,
... name = "{DAV:}lockdiscovery")
True
>>> gsm.unregisterAdapter(Lockdiscovery)
Modified: z3c.dav/trunk/src/z3c/dav/lockingutils.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/lockingutils.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/lockingutils.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -36,9 +36,9 @@
from zope.traversing.browser.absoluteurl import absoluteURL
from zope.app.container.interfaces import IReadContainer
-from zope.webdav.coreproperties import ILockEntry, IDAVSupportedlock, \
+from z3c.dav.coreproperties import ILockEntry, IDAVSupportedlock, \
IActiveLock
-import zope.webdav.interfaces
+import z3c.dav.interfaces
INDIRECT_INDEX_KEY = 'zope.app.dav.lockingutils'
@@ -491,7 +491,7 @@
locktype = [u"write"]
- at component.adapter(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
+ at component.adapter(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
@interface.implementer(IDAVSupportedlock)
def DAVSupportedlock(context, request):
"""
@@ -544,16 +544,16 @@
class DAVSupportedlockAdapter(object):
interface.implements(IDAVSupportedlock)
component.adapts(interface.Interface,
- zope.webdav.interfaces.IWebDAVRequest)
+ z3c.dav.interfaces.IWebDAVRequest)
@property
def supportedlock(self):
return [ExclusiveLockEntry(), SharedLockEntry()]
-WEBDAV_LOCK_KEY = "zope.webdav.lockingutils.info"
+WEBDAV_LOCK_KEY = "z3c.dav.lockingutils.info"
- at component.adapter(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
+ at component.adapter(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
@interface.implementer(IActiveLock)
def DAVActiveLock(context, request):
"""
@@ -568,7 +568,7 @@
>>> import zope.locking.utils
>>> from zope.locking.utility import TokenUtility
>>> from zope.locking.adapters import TokenBroker
- >>> from zope.webdav.publisher import WebDAVRequest
+ >>> from z3c.dav.publisher import WebDAVRequest
>>> def hackNow():
... return datetime.datetime(2007, 4, 7, tzinfo = pytz.utc)
@@ -622,7 +622,7 @@
'/dummy/'
The depth attribute is required by the WebDAV specification. But this
- information is stored by the zope.webdav.lockingutils in the lock token's
+ information is stored by the z3c.dav.lockingutils in the lock token's
annotation. But if a lock token is taken out by an alternative Zope3
application that uses the zope.locking package then this information will
must likely not be set up. So this adapter should provide reasonable
@@ -643,8 +643,8 @@
specified by the WebDAV specification get rendered.
>>> lockdiscovery = DAVLockdiscovery(resource, request)
- >>> davwidget = zope.webdav.properties.getWidget(
- ... zope.webdav.coreproperties.lockdiscovery,
+ >>> davwidget = z3c.dav.properties.getWidget(
+ ... z3c.dav.coreproperties.lockdiscovery,
... lockdiscovery, request)
>>> print etree.tostring(davwidget.render()) #doctest:+XMLDATA
<lockdiscovery xmlns="DAV:" />
@@ -652,8 +652,8 @@
>>> component.getGlobalSiteManager().registerAdapter(DAVActiveLock)
>>> lockdiscovery = DAVLockdiscovery(resource, request)
- >>> davwidget = zope.webdav.properties.getWidget(
- ... zope.webdav.coreproperties.lockdiscovery,
+ >>> davwidget = z3c.dav.properties.getWidget(
+ ... z3c.dav.coreproperties.lockdiscovery,
... lockdiscovery, request)
>>> print etree.tostring(davwidget.render()) #doctest:+XMLDATA
<lockdiscovery xmlns="DAV:">
@@ -694,8 +694,8 @@
['simpletoken']
>>> lockdiscovery = DAVLockdiscovery(resource, request)
- >>> davwidget = zope.webdav.properties.getWidget(
- ... zope.webdav.coreproperties.lockdiscovery,
+ >>> davwidget = z3c.dav.properties.getWidget(
+ ... z3c.dav.coreproperties.lockdiscovery,
... lockdiscovery, request)
>>> print etree.tostring(davwidget.render()) #doctest:+XMLDATA
<lockdiscovery xmlns="DAV:">
@@ -742,8 +742,8 @@
the following.
>>> lockdiscovery = DAVLockdiscovery(resource['demo'], request)
- >>> davwidget = zope.webdav.properties.getWidget(
- ... zope.webdav.coreproperties.lockdiscovery,
+ >>> davwidget = z3c.dav.properties.getWidget(
+ ... z3c.dav.coreproperties.lockdiscovery,
... lockdiscovery, request)
>>> print etree.tostring(davwidget.render()) #doctest:+XMLDATA
<lockdiscovery xmlns="DAV:">
@@ -795,14 +795,14 @@
>>> activelock.lockscope
[]
- >>> activelock.lockscope != zope.webdav.coreproperties.IActiveLock['lockscope'].missing_value
+ >>> activelock.lockscope != z3c.dav.coreproperties.IActiveLock['lockscope'].missing_value
True
Rending this lock token we get the following.
>>> lockdiscovery = DAVLockdiscovery(resource, request)
- >>> davwidget = zope.webdav.properties.getWidget(
- ... zope.webdav.coreproperties.lockdiscovery,
+ >>> davwidget = z3c.dav.properties.getWidget(
+ ... z3c.dav.coreproperties.lockdiscovery,
... lockdiscovery, request)
>>> print etree.tostring(davwidget.render()) #doctest:+XMLDATA
<lockdiscovery xmlns="DAV:">
@@ -834,8 +834,8 @@
True
>>> lockdiscovery = DAVLockdiscovery(resource, request)
- >>> davwidget = zope.webdav.properties.getWidget(
- ... zope.webdav.coreproperties.lockdiscovery,
+ >>> davwidget = z3c.dav.properties.getWidget(
+ ... z3c.dav.coreproperties.lockdiscovery,
... lockdiscovery, request)
>>> print etree.tostring(davwidget.render()) #doctest:+XMLDATA
<lockdiscovery xmlns="DAV:">
@@ -873,7 +873,7 @@
class DAVActiveLockAdapter(object):
component.adapts(interface.Interface,
- zope.webdav.interfaces.IWebDAVRequest)
+ z3c.dav.interfaces.IWebDAVRequest)
interface.implements(IActiveLock)
def __init__(self, token, context, request):
@@ -932,8 +932,8 @@
return absoluteURL(root, self.request)
- at component.adapter(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
- at interface.implementer(zope.webdav.coreproperties.IDAVLockdiscovery)
+ at component.adapter(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
+ at interface.implementer(z3c.dav.coreproperties.IDAVLockdiscovery)
def DAVLockdiscovery(context, request):
"""
This adapter is responsible for getting the data for the
@@ -943,7 +943,7 @@
>>> from zope.interface.verify import verifyObject
>>> from zope.locking.utility import TokenUtility
>>> from zope.locking.adapters import TokenBroker
- >>> from zope.webdav.publisher import WebDAVRequest
+ >>> from z3c.dav.publisher import WebDAVRequest
>>> from cStringIO import StringIO
>>> resource = Demo()
>>> request = WebDAVRequest(StringIO(''), {})
@@ -955,7 +955,7 @@
>>> component.getGlobalSiteManager().registerUtility(
... util, zope.locking.interfaces.ITokenUtility)
>>> component.getGlobalSiteManager().registerAdapter(DAVActiveLock,
- ... (interface.Interface, zope.webdav.interfaces.IWebDAVRequest),
+ ... (interface.Interface, z3c.dav.interfaces.IWebDAVRequest),
... IActiveLock)
>>> component.getGlobalSiteManager().registerAdapter(
... TokenBroker, (interface.Interface,),
@@ -991,7 +991,7 @@
... util, zope.locking.interfaces.ITokenUtility)
True
>>> component.getGlobalSiteManager().unregisterAdapter(DAVActiveLock,
- ... (interface.Interface, zope.webdav.interfaces.IWebDAVRequest),
+ ... (interface.Interface, z3c.dav.interfaces.IWebDAVRequest),
... IActiveLock)
True
>>> component.getGlobalSiteManager().unregisterAdapter(
@@ -1007,9 +1007,9 @@
class DAVLockdiscoveryAdapter(object):
- interface.implements(zope.webdav.coreproperties.IDAVLockdiscovery)
+ interface.implements(z3c.dav.coreproperties.IDAVLockdiscovery)
component.adapts(interface.Interface,
- zope.webdav.interfaces.IWebDAVRequest)
+ z3c.dav.interfaces.IWebDAVRequest)
def __init__(self, context, request):
self.context = context
@@ -1059,7 +1059,7 @@
Test the DAVLockmanager implements the descired interface.
>>> adapter = DAVLockmanager(file)
- >>> verifyObject(zope.webdav.interfaces.IDAVLockmanager, adapter)
+ >>> verifyObject(z3c.dav.interfaces.IDAVLockmanager, adapter)
True
The adapter should also be lockable.
@@ -1177,7 +1177,7 @@
>>> utils.now = oldNow
"""
- interface.implements(zope.webdav.interfaces.IDAVLockmanager)
+ interface.implements(z3c.dav.interfaces.IDAVLockmanager)
component.adapts(interface.Interface)
def __init__(self, context):
@@ -1199,7 +1199,7 @@
tokenBroker = zope.locking.interfaces.ITokenBroker(context)
if tokenBroker.get():
- raise zope.webdav.interfaces.AlreadyLocked(
+ raise z3c.dav.interfaces.AlreadyLocked(
context, message = u"Context or subitem is already locked.")
if roottoken is None:
@@ -1208,7 +1208,7 @@
elif scope == u"shared":
roottoken = tokenBroker.lockShared(duration = duration)
else:
- raise zope.webdav.interfaces.UnprocessableError(
+ raise z3c.dav.interfaces.UnprocessableError(
self.context,
message = u"Invalid lockscope supplied to the lock manager")
Modified: z3c.dav/trunk/src/z3c/dav/mkcol.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/mkcol.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/mkcol.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -23,7 +23,7 @@
from zope.lifecycleevent import ObjectCreatedEvent
import zope.app.http.interfaces
-import zope.webdav.interfaces
+import z3c.dav.interfaces
class MKCOL(object):
"""
@@ -147,9 +147,9 @@
>>> zope.event.subscribers.remove(eventLog)
"""
- interface.implements(zope.webdav.interfaces.IWebDAVMethod)
+ interface.implements(z3c.dav.interfaces.IWebDAVMethod)
component.adapts(zope.app.http.interfaces.INullResource,
- zope.webdav.interfaces.IWebDAVRequest)
+ z3c.dav.interfaces.IWebDAVRequest)
def __init__(self, context, request):
self.context = context
@@ -158,7 +158,7 @@
def MKCOL(self):
if self.request.getHeader("content-length") > 0:
# We don't (yet) support a request body on MKCOL.
- raise zope.webdav.interfaces.UnsupportedMediaType(
+ raise z3c.dav.interfaces.UnsupportedMediaType(
self.context,
message = u"A request body is not supported for a MKCOL method")
@@ -168,7 +168,7 @@
dir = IWriteDirectory(container, None)
dir_factory = IDirectoryFactory(container, None)
if dir is None or dir_factory is None:
- raise zope.webdav.interfaces.ForbiddenError(
+ raise z3c.dav.interfaces.ForbiddenError(
self.context, message = u"")
newdir = dir_factory(name)
Modified: z3c.dav/trunk/src/z3c/dav/properties.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/properties.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/properties.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -24,11 +24,11 @@
from zope.schema.interfaces import IField
from zope.schema.fieldproperty import FieldProperty
-from zope.webdav.interfaces import IDAVProperty, IDAVWidget, IDAVInputWidget
-from zope.webdav.interfaces import IOpaquePropertyStorage
-import zope.webdav.widgets
-from zope.etree.interfaces import IEtree
-import zope.webdav.utils
+import z3c.etree
+from z3c.dav.interfaces import IDAVProperty, IDAVWidget, IDAVInputWidget
+from z3c.dav.interfaces import IOpaquePropertyStorage
+import z3c.dav.widgets
+import z3c.dav.utils
class DAVProperty(object):
"""
@@ -70,7 +70,7 @@
restricted = FieldProperty(IDAVProperty['restricted'])
def __init__(self, tag, iface):
- namespace, name = zope.webdav.utils.parseEtreeTag(tag)
+ namespace, name = z3c.dav.utils.parseEtreeTag(tag)
self.namespace = namespace
self.__name__ = name
self.iface = iface
@@ -80,26 +80,26 @@
self.restricted = False
-_opaque_namespace_key = "zope.webdav.properties.DAVOpaqueProperties"
+_opaque_namespace_key = "z3c.dav.properties.DAVOpaqueProperties"
class DeadField(schema.Field):
pass
-class OpaqueWidget(zope.webdav.widgets.DAVWidget):
+class OpaqueWidget(z3c.dav.widgets.DAVWidget):
def render(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
el = etree.fromstring(self._value)
return el
-class OpaqueInputWidget(zope.webdav.widgets.DAVInputWidget):
+class OpaqueInputWidget(z3c.dav.widgets.DAVInputWidget):
def getInputValue(self):
el = self.getProppatchElement()
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
# XXX - ascii seems a bit wrong here
return etree.tostring(el[0], 'ascii')
@@ -139,7 +139,7 @@
interface.implements(IDAVProperty)
def __init__(self, tag):
- namespace, name = zope.webdav.utils.parseEtreeTag(tag)
+ namespace, name = z3c.dav.utils.parseEtreeTag(tag)
self.__name__ = name
self.namespace = namespace
self.iface = IOpaquePropertyStorage
@@ -194,12 +194,12 @@
if adapter is None:
## XXX - should we use the zope.publisher.interfaces.NotFound
## exceptin here.
- raise zope.webdav.interfaces.PropertyNotFound(context, tag, tag)
+ raise z3c.dav.interfaces.PropertyNotFound(context, tag, tag)
if exists and not adapter.hasProperty(tag):
## XXX - should we use the zope.publisher.interfaces.NotFound
## exceptin here.
- raise zope.webdav.interfaces.PropertyNotFound(context, tag, tag)
+ raise z3c.dav.interfaces.PropertyNotFound(context, tag, tag)
return OpaqueProperty(tag), adapter
@@ -208,7 +208,7 @@
if adapter is None:
## XXX - should we use the zope.publisher.interfaces.NotFound
## exceptin here.
- raise zope.webdav.interfaces.PropertyNotFound(context, tag, tag)
+ raise z3c.dav.interfaces.PropertyNotFound(context, tag, tag)
return prop, adapter
Modified: z3c.dav/trunk/src/z3c/dav/propfind.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/propfind.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/propfind.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -30,7 +30,7 @@
renderSelectedProperties(ob, req, props) - extra argument is a list of all
the properties to render.
-And all these methods return a zope.webdav.utils.IResponse implementation.
+And all these methods return a z3c.dav.utils.IResponse implementation.
$Id$
"""
@@ -45,10 +45,10 @@
from zope.security.checker import canAccess
from zope.security.interfaces import Unauthorized
-from zope.etree.interfaces import IEtree
-import zope.webdav.utils
-import zope.webdav.interfaces
-import zope.webdav.properties
+import z3c.etree
+import z3c.dav.utils
+import z3c.dav.interfaces
+import z3c.dav.properties
DEFAULT_NS = "DAV:"
@@ -56,8 +56,8 @@
"""
PROPFIND handler for all objects.
"""
- interface.implements(zope.webdav.interfaces.IWebDAVMethod)
- component.adapts(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
+ interface.implements(z3c.dav.interfaces.IWebDAVMethod)
+ component.adapts(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
def __init__(self, context, request):
self.context = context
@@ -70,13 +70,13 @@
def PROPFIND(self):
if self.request.getHeader("content-length") > 0 and \
self.request.content_type not in ("text/xml", "application/xml"):
- raise zope.webdav.interfaces.BadRequest(
+ raise z3c.dav.interfaces.BadRequest(
self.request,
message = u"PROPFIND requires a valid XML request")
depth = self.getDepth()
if depth not in ("0", "1", "infinity"):
- raise zope.webdav.interfaces.BadRequest(
+ raise z3c.dav.interfaces.BadRequest(
self.request, message = u"Invalid Depth header supplied")
propertiesFactory = None
@@ -85,7 +85,7 @@
propfind = self.request.xmlDataSource
if propfind is not None:
if propfind.tag != "{DAV:}propfind":
- raise zope.webdav.interfaces.UnprocessableError(
+ raise z3c.dav.interfaces.UnprocessableError(
self.context,
message = u"Request is not a `propfind' XML element.")
properties = propfind[0]
@@ -104,18 +104,18 @@
propertiesFactory = self.renderSelectedProperties
extraArg = properties
else:
- raise zope.webdav.interfaces.UnprocessableError(
+ raise z3c.dav.interfaces.UnprocessableError(
self.context,
message = u"Unknown propfind property element.")
else:
propertiesFactory = self.renderAllProperties
- multistatus = zope.webdav.utils.MultiStatus()
+ multistatus = z3c.dav.utils.MultiStatus()
responses = self.handlePropfindResource(
self.context, self.request, depth, propertiesFactory, extraArg)
multistatus.responses.extend(responses)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
self.request.response.setStatus(207)
self.request.response.setHeader("content-type", "application/xml")
@@ -148,7 +148,7 @@
def handleException(self, proptag, exc_info, request, response):
error_view = component.queryMultiAdapter(
- (exc_info[1], request), zope.webdav.interfaces.IDAVErrorWidget)
+ (exc_info[1], request), z3c.dav.interfaces.IDAVErrorWidget)
if error_view is None:
## An unexpected error occured here. This error should be
## fixed. In order to easily debug the problem we will
@@ -162,7 +162,7 @@
propstat.responsedescription += error_view.propstatdescription
response.responsedescription += error_view.responsedescription
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propstat.properties.append(etree.Element(proptag))
def renderPropnames(self, ob, req, ignore):
@@ -172,13 +172,13 @@
the storage adapters should be enough to hide any properties that users
don't have permission to see.
"""
- response = zope.webdav.utils.Response(
- zope.webdav.utils.getObjectURL(ob, req))
+ response = z3c.dav.utils.Response(
+ z3c.dav.utils.getObjectURL(ob, req))
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
for davprop, adapter in \
- zope.webdav.properties.getAllProperties(ob, req):
+ z3c.dav.properties.getAllProperties(ob, req):
rendered_name = etree.Element(etree.QName(davprop.namespace,
davprop.__name__))
response.addProperty(200, rendered_name)
@@ -195,11 +195,11 @@
MAY be silently excluded from the response.
"""
- response = zope.webdav.utils.Response(
- zope.webdav.utils.getObjectURL(ob, req))
+ response = z3c.dav.utils.Response(
+ z3c.dav.utils.getObjectURL(ob, req))
for davprop, adapter in \
- zope.webdav.properties.getAllProperties(ob, req):
+ z3c.dav.properties.getAllProperties(ob, req):
isIncluded = False
if include is not None and \
include.find("{%s}%s" %(davprop.namespace,
@@ -211,7 +211,7 @@
try:
# getWidget and render are two possible areas where the
# property is silently ignored because of security concerns.
- davwidget = zope.webdav.properties.getWidget(
+ davwidget = z3c.dav.properties.getWidget(
davprop, adapter, req)
response.addProperty(200, davwidget.render())
except Unauthorized:
@@ -232,14 +232,14 @@
return response
def renderSelectedProperties(self, ob, req, props):
- response = zope.webdav.utils.Response(
- zope.webdav.utils.getObjectURL(ob, req))
+ response = z3c.dav.utils.Response(
+ z3c.dav.utils.getObjectURL(ob, req))
for prop in props:
try:
- davprop, adapter = zope.webdav.properties.getProperty(
+ davprop, adapter = z3c.dav.properties.getProperty(
ob, req, prop.tag, exists = True)
- davwidget = zope.webdav.properties.getWidget(
+ davwidget = z3c.dav.properties.getWidget(
davprop, adapter, req)
propstat = response.getPropstat(200)
propstat.properties.append(davwidget.render())
Modified: z3c.dav/trunk/src/z3c/dav/proppatch.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/proppatch.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/proppatch.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -25,17 +25,17 @@
from zope import component
from zope.lifecycleevent import ObjectModifiedEvent
-import zope.webdav.utils
-import zope.webdav.interfaces
-import zope.webdav.properties
-from zope.etree.interfaces import IEtree
+import z3c.etree
from zope.security.interfaces import Unauthorized
+import z3c.dav.utils
+import z3c.dav.interfaces
+import z3c.dav.properties
class PROPPATCH(object):
"""PROPPATCH handler for all objects"""
- interface.implements(zope.webdav.interfaces.IWebDAVMethod)
- component.adapts(interface.Interface, zope.webdav.interfaces.IWebDAVRequest)
+ interface.implements(z3c.dav.interfaces.IWebDAVMethod)
+ component.adapts(interface.Interface, z3c.dav.interfaces.IWebDAVRequest)
def __init__(self, context, request):
self.context = context
@@ -43,18 +43,18 @@
def PROPPATCH(self):
if self.request.content_type not in ("text/xml", "application/xml"):
- raise zope.webdav.interfaces.BadRequest(
+ raise z3c.dav.interfaces.BadRequest(
self.request,
message = "All PROPPATCH requests needs a XML body")
xmldata = self.request.xmlDataSource
if xmldata.tag != "{DAV:}propertyupdate":
- raise zope.webdav.interfaces.UnprocessableError(
+ raise z3c.dav.interfaces.UnprocessableError(
self.context,
message = u"PROPPATCH request body must be a "
"`propertyupdate' XML element.")
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
# propErrors - list of (property tag, error). error is None if no
# error occurred in setting / removing the property.
@@ -90,13 +90,13 @@
properties.append(prop.tag)
if propErrors:
- errors = zope.webdav.interfaces.WebDAVPropstatErrors(self.context)
+ errors = z3c.dav.interfaces.WebDAVPropstatErrors(self.context)
for prop, error in propErrors:
errors[prop] = error
for proptag in properties:
- errors[proptag] = zope.webdav.interfaces.FailedDependency(
+ errors[proptag] = z3c.dav.interfaces.FailedDependency(
self.context, proptag)
raise errors # this kills the current transaction.
@@ -104,14 +104,14 @@
if changed:
zope.event.notify(ObjectModifiedEvent(self.context))
- url = zope.webdav.utils.getObjectURL(self.context, self.request)
- response = zope.webdav.utils.Response(url)
+ url = z3c.dav.utils.getObjectURL(self.context, self.request)
+ response = z3c.dav.utils.Response(url)
propstat = response.getPropstat(200)
for proptag in properties:
propstat.properties.append(etree.Element(proptag))
- multistatus = zope.webdav.utils.MultiStatus()
+ multistatus = z3c.dav.utils.MultiStatus()
multistatus.responses.append(response)
self.request.response.setStatus(207)
@@ -119,17 +119,17 @@
return etree.tostring(multistatus())
def handleSet(self, prop):
- davprop, adapter = zope.webdav.properties.getProperty(
+ davprop, adapter = z3c.dav.properties.getProperty(
self.context, self.request, prop.tag)
- widget = zope.webdav.properties.getWidget(
+ widget = z3c.dav.properties.getWidget(
davprop, adapter, self.request,
- type = zope.webdav.interfaces.IDAVInputWidget)
+ type = z3c.dav.interfaces.IDAVInputWidget)
field = davprop.field.bind(adapter)
if field.readonly:
- raise zope.webdav.interfaces.ForbiddenError(
+ raise z3c.dav.interfaces.ForbiddenError(
self.context, prop.tag, message = u"readonly field")
value = widget.getInputValue()
@@ -142,18 +142,18 @@
def handleRemove(self, prop):
davprop = component.queryUtility(
- zope.webdav.interfaces.IDAVProperty, prop.tag, None)
+ z3c.dav.interfaces.IDAVProperty, prop.tag, None)
if davprop is not None:
- raise zope.webdav.interfaces.ConflictError(
+ raise z3c.dav.interfaces.ConflictError(
self.context, prop.tag,
message = u"cannot remove a live property")
- deadproperties = zope.webdav.interfaces.IOpaquePropertyStorage(
+ deadproperties = z3c.dav.interfaces.IOpaquePropertyStorage(
self.context, None)
if deadproperties is None or not deadproperties.hasProperty(prop.tag):
- raise zope.webdav.interfaces.ConflictError(
+ raise z3c.dav.interfaces.ConflictError(
self.context, prop.tag, message = u"property doesn't exist")
deadproperties.removeProperty(prop.tag)
Modified: z3c.dav/trunk/src/z3c/dav/publisher.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/publisher.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/publisher.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -21,7 +21,7 @@
from zope.app.publication.http import HTTPPublication
from zope.app.publication.interfaces import IRequestPublicationFactory
-from zope.etree.interfaces import IEtree
+import z3c.etree
import interfaces
@@ -58,7 +58,7 @@
if content_type in ("text/xml", "application/xml") and \
self.getHeader("content-length", 0) > 0:
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
try:
self.xmlDataSource = etree.parse(self.bodyStream).getroot()
except:
Modified: z3c.dav/trunk/src/z3c/dav/tests/__init__.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/__init__.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/tests/__init__.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Collection of tests for zope.webdav
+"""Collection of tests for z3c.dav
$Id$
"""
Modified: z3c.dav/trunk/src/z3c/dav/tests/test_copymove.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_copymove.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_copymove.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -31,8 +31,8 @@
from zope.app.container.interfaces import IReadContainer
from zope.traversing.interfaces import IContainmentRoot
-import zope.webdav.publisher
-from zope.webdav.copymove import COPY, MOVE
+import z3c.dav.publisher
+from z3c.dav.copymove import COPY, MOVE
class IResource(interface.Interface):
@@ -72,7 +72,7 @@
class RootCollectionResource(CollectionResource):
interface.implements(IContainmentRoot)
-class TestRequest(zope.webdav.publisher.WebDAVRequest):
+class TestRequest(z3c.dav.publisher.WebDAVRequest):
def __init__(self, environ = {}):
env = environ.copy()
@@ -154,14 +154,14 @@
request = TestRequest(environ = {"OVERWRITE": "x"})
copy = COPY(None, request)
- self.assertRaises(zope.webdav.interfaces.BadRequest, copy.getOverwrite)
+ self.assertRaises(z3c.dav.interfaces.BadRequest, copy.getOverwrite)
def test_default_destination_path(self):
request = TestRequest()
copy = COPY(None, request)
self.assertRaises(
- zope.webdav.interfaces.BadRequest, copy.getDestinationPath)
+ z3c.dav.interfaces.BadRequest, copy.getDestinationPath)
def test_destination_path(self):
request = TestRequest(
@@ -182,7 +182,7 @@
environ = {"DESTINATION": "http://www.server.com/testpath"})
copy = COPY(None, request)
- self.assertRaises(zope.webdav.interfaces.BadGateway,
+ self.assertRaises(z3c.dav.interfaces.BadGateway,
copy.getDestinationPath)
def test_getDestinationPath_with_username(self):
@@ -212,7 +212,7 @@
request = TestRequest(
environ = {"DESTINATION": "http://localhost:10080/testpath"})
copy = COPY(resource, request)
- self.assertRaises(zope.webdav.interfaces.BadGateway,
+ self.assertRaises(z3c.dav.interfaces.BadGateway,
copy.getDestinationNameAndParentObject)
def test_getDestinationNameAndParentObject(self):
@@ -248,7 +248,7 @@
"OVERWRITE": "F"})
copy = COPY(resource, request)
- self.assertRaises(zope.webdav.interfaces.PreconditionFailed,
+ self.assertRaises(z3c.dav.interfaces.PreconditionFailed,
copy.getDestinationNameAndParentObject)
self.assert_("destresource" in self.root)
@@ -258,7 +258,7 @@
environ = {"DESTINATION": "http://localhost/noparent/testpath"})
copy = COPY(resource, request)
- self.assertRaises(zope.webdav.interfaces.ConflictError,
+ self.assertRaises(z3c.dav.interfaces.ConflictError,
copy.getDestinationNameAndParentObject)
def test_getDestinationNameAndParentObject_destob_sameob(self):
@@ -268,7 +268,7 @@
"OVERWRITE": "T"})
copy = COPY(resource, request)
- self.assertRaises(zope.webdav.interfaces.ForbiddenError,
+ self.assertRaises(z3c.dav.interfaces.ForbiddenError,
copy.getDestinationNameAndParentObject)
def test_nocopier(self):
@@ -350,7 +350,7 @@
gsm.registerAdapter(Copier, (IResource,))
gsm.registerAdapter(DummyResourceURL,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
def tearDown(self):
del self.root
@@ -361,7 +361,7 @@
gsm.unregisterAdapter(Copier, (IResource,))
gsm.unregisterAdapter(DummyResourceURL,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
def test_copy(self):
resource = self.root["resource"] = Resource()
@@ -411,7 +411,7 @@
Copier.canCopyableTo = False
copy = COPY(resource, request)
- self.assertRaises(zope.webdav.interfaces.ConflictError, copy.COPY)
+ self.assertRaises(z3c.dav.interfaces.ConflictError, copy.COPY)
class Movier(object):
@@ -449,7 +449,7 @@
gsm.registerAdapter(Movier, (IResource,))
gsm.registerAdapter(DummyResourceURL,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
def tearDown(self):
del self.root
@@ -460,7 +460,7 @@
gsm.unregisterAdapter(Movier, (IResource,))
gsm.unregisterAdapter(DummyResourceURL,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
def test_move(self):
resource = self.root["resource"] = Resource()
@@ -508,7 +508,7 @@
Movier.isMoveableTo = False
move = MOVE(resource, request)
- self.assertRaises(zope.webdav.interfaces.ConflictError, move.MOVE)
+ self.assertRaises(z3c.dav.interfaces.ConflictError, move.MOVE)
def test_suite():
Modified: z3c.dav/trunk/src/z3c/dav/tests/test_doctests.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_doctests.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_doctests.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Run all doctests contained within zope.webdav.
+"""Run all doctests contained within z3c.dav.
$Id$
"""
@@ -35,9 +35,9 @@
queryInteraction
from zope.traversing.browser.interfaces import IAbsoluteURL
-import zope.etree.testing
-import zope.webdav.widgets
-import zope.webdav.interfaces
+import z3c.etree.testing
+import z3c.dav.widgets
+import z3c.dav.interfaces
class IDemo(IContained):
@@ -128,7 +128,7 @@
def lockingSetUp(test):
placelesssetup.setUp(test)
- zope.etree.testing.etreeSetup(test)
+ z3c.etree.testing.etreeSetup(test)
# create principal
participation = Participation(Principal('michael'))
@@ -158,21 +158,21 @@
# register some IDAVWidgets so that we can render the activelock and
# supportedlock widgets.
- gsm.registerAdapter(zope.webdav.widgets.ListDAVWidget,
+ gsm.registerAdapter(z3c.dav.widgets.ListDAVWidget,
(zope.schema.interfaces.IList,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.widgets.ObjectDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.widgets.ObjectDAVWidget,
(zope.schema.interfaces.IObject,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.widgets.TextDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.widgets.TextDAVWidget,
(zope.schema.interfaces.IText,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.properties.OpaqueWidget,
- (zope.webdav.properties.DeadField,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.widgets.TextDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.properties.OpaqueWidget,
+ (z3c.dav.properties.DeadField,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.widgets.TextDAVWidget,
(zope.schema.interfaces.IURI,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
# expose these classes to the test
test.globs["Demo"] = Demo
@@ -181,7 +181,7 @@
def lockingTearDown(test):
placelesssetup.tearDown(test)
- zope.etree.testing.etreeTearDown(test)
+ z3c.etree.testing.etreeTearDown(test)
events = test.globs.pop("events")
assert zope.event.subscribers.pop().__self__ is events
@@ -205,54 +205,54 @@
(IDemoFolder, interface.Interface),
IAbsoluteURL)
- gsm.unregisterAdapter(zope.webdav.widgets.ListDAVWidget,
+ gsm.unregisterAdapter(z3c.dav.widgets.ListDAVWidget,
(zope.schema.interfaces.IList,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.widgets.ObjectDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.widgets.ObjectDAVWidget,
(zope.schema.interfaces.IObject,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.widgets.TextDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.widgets.TextDAVWidget,
(zope.schema.interfaces.IText,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.properties.OpaqueWidget,
- (zope.webdav.properties.DeadField,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.widgets.TextDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.properties.OpaqueWidget,
+ (z3c.dav.properties.DeadField,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.widgets.TextDAVWidget,
(zope.schema.interfaces.IURI,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
endInteraction()
def test_suite():
return unittest.TestSuite((
- doctest.DocTestSuite("zope.webdav.properties",
+ doctest.DocTestSuite("z3c.dav.properties",
setUp = contentSetup, tearDown = contentTeardown),
- doctest.DocTestSuite("zope.webdav.utils",
- checker = zope.etree.testing.xmlOutputChecker,
- setUp = zope.etree.testing.etreeSetup,
- tearDown = zope.etree.testing.etreeTearDown),
- doctest.DocTestSuite("zope.webdav.coreproperties",
- checker = zope.etree.testing.xmlOutputChecker,
- setUp = zope.etree.testing.etreeSetup,
- tearDown = zope.etree.testing.etreeTearDown),
- doctest.DocFileSuite("datamodel.txt", package = "zope.webdav",
- checker = zope.etree.testing.xmlOutputChecker,
- setUp = zope.etree.testing.etreeSetup,
- tearDown = zope.etree.testing.etreeTearDown),
- doctest.DocTestSuite("zope.webdav.lockingutils",
- checker = zope.etree.testing.xmlOutputChecker,
+ doctest.DocTestSuite("z3c.dav.utils",
+ checker = z3c.etree.testing.xmlOutputChecker,
+ setUp = z3c.etree.testing.etreeSetup,
+ tearDown = z3c.etree.testing.etreeTearDown),
+ doctest.DocTestSuite("z3c.dav.coreproperties",
+ checker = z3c.etree.testing.xmlOutputChecker,
+ setUp = z3c.etree.testing.etreeSetup,
+ tearDown = z3c.etree.testing.etreeTearDown),
+ doctest.DocFileSuite("datamodel.txt", package = "z3c.dav",
+ checker = z3c.etree.testing.xmlOutputChecker,
+ setUp = z3c.etree.testing.etreeSetup,
+ tearDown = z3c.etree.testing.etreeTearDown),
+ doctest.DocTestSuite("z3c.dav.lockingutils",
+ checker = z3c.etree.testing.xmlOutputChecker,
setUp = lockingSetUp,
tearDown = lockingTearDown),
- doctest.DocTestSuite("zope.webdav.deadproperties"),
- doctest.DocTestSuite("zope.webdav.adapters"),
- doctest.DocTestSuite("zope.webdav.locking",
- checker = zope.etree.testing.xmlOutputChecker,
- setUp = zope.etree.testing.etreeSetup,
- tearDown = zope.etree.testing.etreeTearDown),
- doctest.DocFileSuite("locking.txt", package = "zope.webdav",
- checker = zope.etree.testing.xmlOutputChecker,
- setUp = zope.etree.testing.etreeSetup,
- tearDown = zope.etree.testing.etreeTearDown),
- doctest.DocTestSuite("zope.webdav.mkcol"),
+ doctest.DocTestSuite("z3c.dav.deadproperties"),
+ doctest.DocTestSuite("z3c.dav.adapters"),
+ doctest.DocTestSuite("z3c.dav.locking",
+ checker = z3c.etree.testing.xmlOutputChecker,
+ setUp = z3c.etree.testing.etreeSetup,
+ tearDown = z3c.etree.testing.etreeTearDown),
+ doctest.DocFileSuite("locking.txt", package = "z3c.dav",
+ checker = z3c.etree.testing.xmlOutputChecker,
+ setUp = z3c.etree.testing.etreeSetup,
+ tearDown = z3c.etree.testing.etreeTearDown),
+ doctest.DocTestSuite("z3c.dav.mkcol"),
))
Modified: z3c.dav/trunk/src/z3c/dav/tests/test_inputwidgets.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_inputwidgets.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_inputwidgets.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -28,10 +28,10 @@
from zope.app.form.interfaces import ConversionError, MissingInputError
from zope.datetime import tzinfo
-from zope.webdav import widgets
-from zope.webdav.interfaces import IDAVInputWidget
-from zope.etree.interfaces import IEtree
-from zope.etree.testing import etreeSetup, etreeTearDown
+from z3c.dav import widgets
+from z3c.dav.interfaces import IDAVInputWidget
+import z3c.etree
+from z3c.etree.testing import etreeSetup, etreeTearDown
from test_widgets import TestWebDAVRequest
@@ -54,7 +54,7 @@
def setUp(self):
etreeSetup()
- self.etree = component.getUtility(IEtree)
+ self.etree = z3c.etree.getEngine()
def setUpContent(self, desc = u'', title = u'Foo Title', element = None):
## setup the field first to stop some really weird errors
Modified: z3c.dav/trunk/src/z3c/dav/tests/test_propfind.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_propfind.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_propfind.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -35,20 +35,20 @@
from zope.security.interfaces import IChecker
from zope.security.checker import CheckerPublic
-import zope.webdav.properties
-import zope.webdav.publisher
-import zope.webdav.widgets
-import zope.webdav.exceptions
-import zope.webdav.coreproperties
-from zope.webdav.propfind import PROPFIND
-from zope.etree.testing import etreeSetup, etreeTearDown, assertXMLEqual
-from zope.etree.interfaces import IEtree
+import z3c.dav.properties
+import z3c.dav.publisher
+import z3c.dav.widgets
+import z3c.dav.exceptions
+import z3c.dav.coreproperties
+from z3c.dav.propfind import PROPFIND
+from z3c.etree.testing import etreeSetup, etreeTearDown, assertXMLEqual
+import z3c.etree
from test_proppatch import unauthProperty, UnauthorizedPropertyStorage, \
IUnauthorizedPropertyStorage
from utils import TestMultiStatusBody
-class TestRequest(zope.webdav.publisher.WebDAVRequest):
+class TestRequest(z3c.dav.publisher.WebDAVRequest):
def __init__(self, properties = None, environ = {}):
if properties is not None:
@@ -102,11 +102,11 @@
return propfind
def test_notxml(self):
- self.assertRaises(zope.webdav.interfaces.BadRequest, self.checkPropfind,
+ self.assertRaises(z3c.dav.interfaces.BadRequest, self.checkPropfind,
"<propname />", {"CONTENT_TYPE": "text/plain"})
def test_bad_depthheader(self):
- self.assertRaises(zope.webdav.interfaces.BadRequest, self.checkPropfind,
+ self.assertRaises(z3c.dav.interfaces.BadRequest, self.checkPropfind,
"<propname />", {"DEPTH": "2"})
def test_depth_header(self):
@@ -158,15 +158,15 @@
"""
env = {"CONTENT_TYPE": "text/xml",
"CONTENT_LENGTH": len(body)}
- request = zope.webdav.publisher.WebDAVRequest(StringIO(body), env)
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(body), env)
request.processInputs()
propf = PROPFINDBodyParsed(None, request)
- self.assertRaises(zope.webdav.interfaces.UnprocessableError,
+ self.assertRaises(z3c.dav.interfaces.UnprocessableError,
propf.PROPFIND)
def test_xml_propfind_bad_content(self):
- self.assertRaises(zope.webdav.interfaces.UnprocessableError,
+ self.assertRaises(z3c.dav.interfaces.UnprocessableError,
self.checkPropfind, properties = "<noproperties />")
@@ -188,13 +188,13 @@
brokenprop = schema.Text(
title = u"Property which does not render")
-exampleIntProperty = zope.webdav.properties.DAVProperty(
+exampleIntProperty = z3c.dav.properties.DAVProperty(
"{DAVtest:}exampleintprop", IExamplePropertyStorage)
-exampleTextProperty = zope.webdav.properties.DAVProperty(
+exampleTextProperty = z3c.dav.properties.DAVProperty(
"{DAVtest:}exampletextprop", IExamplePropertyStorage)
-extraTextProperty = zope.webdav.properties.DAVProperty(
+extraTextProperty = z3c.dav.properties.DAVProperty(
"{DAVtest:}extratextprop", IExtraPropertyStorage)
-brokenProperty = zope.webdav.properties.DAVProperty(
+brokenProperty = z3c.dav.properties.DAVProperty(
"{DAVtest:}brokenprop", IBrokenPropertyStorage)
# this is a hack to make all the render all properties work as this broken
# property then never shows up these tests responses.
@@ -294,55 +294,55 @@
gsm.registerUtility(exampleIntProperty,
name = "{DAVtest:}exampleintprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
gsm.registerUtility(exampleTextProperty,
name = "{DAVtest:}exampletextprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
exampleTextProperty.restricted = False
gsm.registerUtility(extraTextProperty,
name = "{DAVtest:}extratextprop",
- provided = zope.webdav.interfaces.IDAVProperty)
- gsm.registerUtility(zope.webdav.coreproperties.resourcetype,
+ provided = z3c.dav.interfaces.IDAVProperty)
+ gsm.registerUtility(z3c.dav.coreproperties.resourcetype,
name = "{DAV:}resourcetype")
gsm.registerUtility(brokenProperty, name = "{DAVtest:}brokenprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
gsm.registerUtility(unauthProperty, name = "{DAVtest:}unauthprop")
# make sure that this property is always restricted so that we
# only try and render this property whenever we want to.
unauthProperty.restricted = True
gsm.registerAdapter(ExamplePropertyStorage,
- (IResource, zope.webdav.interfaces.IWebDAVRequest),
+ (IResource, z3c.dav.interfaces.IWebDAVRequest),
provided = IExamplePropertyStorage)
gsm.registerAdapter(BrokenPropertyStorage,
- (IResource, zope.webdav.interfaces.IWebDAVRequest),
+ (IResource, z3c.dav.interfaces.IWebDAVRequest),
provided = IBrokenPropertyStorage)
gsm.registerAdapter(UnauthorizedPropertyStorage,
- (IResource, zope.webdav.interfaces.IWebDAVRequest),
+ (IResource, z3c.dav.interfaces.IWebDAVRequest),
provided = IUnauthorizedPropertyStorage)
- gsm.registerAdapter(zope.webdav.coreproperties.ResourceTypeAdapter)
+ gsm.registerAdapter(z3c.dav.coreproperties.ResourceTypeAdapter)
gsm.registerAdapter(DummyResourceURL,
- (IResource, zope.webdav.interfaces.IWebDAVRequest))
+ (IResource, z3c.dav.interfaces.IWebDAVRequest))
gsm.registerAdapter(DummyResourceURL,
- (ICollection, zope.webdav.interfaces.IWebDAVRequest))
+ (ICollection, z3c.dav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.widgets.TextDAVWidget,
+ gsm.registerAdapter(z3c.dav.widgets.TextDAVWidget,
(zope.schema.interfaces.IText,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.widgets.IntDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.widgets.IntDAVWidget,
(zope.schema.interfaces.IInt,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.widgets.ListDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.widgets.ListDAVWidget,
(zope.schema.interfaces.IList,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.exceptions.PropertyNotFoundError,
- (zope.webdav.interfaces.IPropertyNotFound,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.exceptions.UnauthorizedError,
+ gsm.registerAdapter(z3c.dav.exceptions.PropertyNotFoundError,
+ (z3c.dav.interfaces.IPropertyNotFound,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.exceptions.UnauthorizedError,
(IUnauthorized,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
def propfindTearDown():
etreeTearDown()
@@ -351,50 +351,50 @@
gsm.unregisterUtility(exampleIntProperty,
name = "{DAVtest:}exampleintprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
gsm.unregisterUtility(exampleTextProperty,
name = "{DAVtest:}exampletextprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
gsm.unregisterUtility(extraTextProperty,
name = "{DAVtest:}extratextprop",
- provided = zope.webdav.interfaces.IDAVProperty)
- gsm.unregisterUtility(zope.webdav.coreproperties.resourcetype,
+ provided = z3c.dav.interfaces.IDAVProperty)
+ gsm.unregisterUtility(z3c.dav.coreproperties.resourcetype,
name = "{DAV:}resourcetype")
gsm.unregisterUtility(brokenProperty, name = "{DAVtest:}brokenprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
gsm.unregisterUtility(unauthProperty, name = "{DAVtest:}unauthprop")
gsm.unregisterAdapter(ExamplePropertyStorage,
- (IResource, zope.webdav.interfaces.IWebDAVRequest),
+ (IResource, z3c.dav.interfaces.IWebDAVRequest),
provided = IExamplePropertyStorage)
gsm.unregisterAdapter(BrokenPropertyStorage,
- (IResource, zope.webdav.interfaces.IWebDAVRequest),
+ (IResource, z3c.dav.interfaces.IWebDAVRequest),
provided = IBrokenPropertyStorage)
gsm.registerAdapter(UnauthorizedPropertyStorage,
- (IResource, zope.webdav.interfaces.IWebDAVRequest),
+ (IResource, z3c.dav.interfaces.IWebDAVRequest),
provided = IUnauthorizedPropertyStorage)
- gsm.unregisterAdapter(zope.webdav.coreproperties.ResourceTypeAdapter)
+ gsm.unregisterAdapter(z3c.dav.coreproperties.ResourceTypeAdapter)
gsm.unregisterAdapter(DummyResourceURL,
- (IResource, zope.webdav.interfaces.IWebDAVRequest))
+ (IResource, z3c.dav.interfaces.IWebDAVRequest))
gsm.unregisterAdapter(DummyResourceURL,
- (ICollection, zope.webdav.interfaces.IWebDAVRequest))
+ (ICollection, z3c.dav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.widgets.TextDAVWidget,
+ gsm.unregisterAdapter(z3c.dav.widgets.TextDAVWidget,
(zope.schema.interfaces.IText,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.widgets.IntDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.widgets.IntDAVWidget,
(zope.schema.interfaces.IInt,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.exceptions.PropertyNotFoundError,
- (zope.webdav.interfaces.IPropertyNotFound,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.exceptions.UnauthorizedError,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.exceptions.PropertyNotFoundError,
+ (z3c.dav.interfaces.IPropertyNotFound,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.exceptions.UnauthorizedError,
(IUnauthorized,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.widgets.ListDAVWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.widgets.ListDAVWidget,
(zope.schema.interfaces.IList,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
class ErrorReportingUtility(object):
@@ -426,7 +426,7 @@
def test_renderPropnames(self):
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, None)
response = propf.renderPropnames(resource, request, None)
@@ -455,10 +455,10 @@
def test_renderSelected(self):
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, None)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
props = etree.fromstring("""<prop xmlns="DAV:" xmlns:D="DAVtest:">
<D:exampletextprop />
<D:exampleintprop />
@@ -477,10 +477,10 @@
def test_renderSelected_notfound(self):
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, None)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
props = etree.fromstring("""<prop xmlns="DAV:" xmlns:D="DAVtest:">
<D:exampletextprop />
<D:extratextprop />
@@ -505,7 +505,7 @@
def test_renderAllProperties(self):
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, None)
response = propf.renderAllProperties(resource, request, None)
@@ -523,10 +523,10 @@
def test_renderAllProperties_withInclude(self):
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, None)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
include = etree.fromstring("""<include xmlns="DAV:" xmlns:D="DAVtest:">
<D:exampletextprop />
</include>""")
@@ -545,7 +545,7 @@
def test_renderAllProperties_withRestrictedProp(self):
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, None)
exampleTextProperty.restricted = True
@@ -563,11 +563,11 @@
def test_renderAllProperties_withRestrictedProp_include(self):
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, None)
exampleTextProperty.restricted = True
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
include = etree.fromstring("""<include xmlns="DAV:" xmlns:D="DAVtest:">
<D:exampletextprop />
</include>""")
@@ -586,10 +586,10 @@
def test_renderBrokenProperty(self):
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, None)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
props = etree.fromstring("""<prop xmlns="DAV:" xmlns:D="DAVtest:">
<D:brokenprop />
</prop>""")
@@ -606,10 +606,10 @@
def test_render_selected_unauthorizedProperty(self):
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, None)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
props = etree.fromstring("""<prop xmlns="DAV:" xmlns:D="DAVtest:">
<D:unauthprop />
<D:exampletextprop />
@@ -634,7 +634,7 @@
# access one of the propertues then this property should be threated
# as if it were restricted property and not returned to the user.
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, request)
# Set the unauthproperty as un-restricted so that the
@@ -665,10 +665,10 @@
# should get the property back as part of the multistatus response
# but with a status 401 and no content.
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, request)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
includes = etree.fromstring("""<include xmlns="DAV:" xmlns:D="DAVtest:">
<D:unauthprop />
</include>""")
@@ -687,10 +687,10 @@
# this property back as part of the multistatus response but with a
# status 500 and no content.
resource = Resource("some text", 10)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propf = PROPFIND(None, request)
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
includes = etree.fromstring("""<include xmlns="DAV:" xmlns:D="DAVtest:">
<D:brokenprop />
</include>""")
@@ -760,12 +760,12 @@
collection["r1"] = Resource("some text - r1", 2)
collection["c"] = Collection()
collection["c"]["r2"] = Resource("some text - r2", 4)
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
request.processInputs()
propf = PROPFIND(collection, request)
result = propf.PROPFIND()
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
etree.fromstring(result)
assertXMLEqual(result, """<ns0:multistatus xmlns:ns0="DAV:">
Modified: z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -31,13 +31,13 @@
from zope.security.interfaces import Unauthorized
from zope.lifecycleevent.interfaces import IObjectModifiedEvent
-import zope.webdav.proppatch
-import zope.webdav.publisher
-import zope.webdav.interfaces
-from zope.etree.interfaces import IEtree
-from zope.etree.testing import etreeSetup, etreeTearDown, assertXMLEqual
+import z3c.dav.proppatch
+import z3c.dav.publisher
+import z3c.dav.interfaces
+import z3c.etree
+from z3c.etree.testing import etreeSetup, etreeTearDown, assertXMLEqual
-class TestRequest(zope.webdav.publisher.WebDAVRequest):
+class TestRequest(z3c.dav.publisher.WebDAVRequest):
def __init__(self, set_properties = None, remove_properties = None,
environ = {}):
@@ -108,7 +108,7 @@
__call__ = __str__
-class PROPPATCHHandler(zope.webdav.proppatch.PROPPATCH):
+class PROPPATCHHandler(z3c.dav.proppatch.PROPPATCH):
def __init__(self, context, request):
super(PROPPATCHHandler, self).__init__(context, request)
@@ -133,7 +133,7 @@
gsm = component.getGlobalSiteManager()
gsm.registerAdapter(DummyResourceURL,
- (IResource, zope.webdav.interfaces.IWebDAVRequest))
+ (IResource, z3c.dav.interfaces.IWebDAVRequest))
def tearDown(self):
etreeTearDown()
@@ -142,20 +142,20 @@
gsm.unregisterAdapter(DummyResourceURL,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
def test_noxml(self):
- request = zope.webdav.publisher.WebDAVRequest(StringIO(""), {})
+ request = z3c.dav.publisher.WebDAVRequest(StringIO(""), {})
propp = PROPPATCHHandler(Resource(), request)
- self.assertRaises(zope.webdav.interfaces.BadRequest, propp.PROPPATCH)
+ self.assertRaises(z3c.dav.interfaces.BadRequest, propp.PROPPATCH)
def test_notxml(self):
- request = zope.webdav.publisher.WebDAVRequest(
+ request = z3c.dav.publisher.WebDAVRequest(
StringIO("content"), {"CONTENT_TYPE": "text/plain",
"CONTENT_LENGTH": 7})
propp = PROPPATCHHandler(Resource(), request)
request.processInputs()
- self.assertRaises(zope.webdav.interfaces.BadRequest, propp.PROPPATCH)
+ self.assertRaises(z3c.dav.interfaces.BadRequest, propp.PROPPATCH)
def test_notproppatch(self):
body = """<?xml version="1.0" encoding="utf-8" ?>
@@ -164,13 +164,13 @@
</D:notpropertyupdate>
"""
- request = zope.webdav.publisher.WebDAVRequest(
+ request = z3c.dav.publisher.WebDAVRequest(
StringIO(body), {"CONTENT_TYPE": "text/xml",
"CONTENT_LENGTH": len(body)})
request.processInputs()
propp = PROPPATCHHandler(Resource(), request)
- self.assertRaises(zope.webdav.interfaces.UnprocessableError,
+ self.assertRaises(z3c.dav.interfaces.UnprocessableError,
propp.PROPPATCH)
def test_not_set_element(self):
@@ -180,7 +180,7 @@
</propertyupdate>
"""
- request = zope.webdav.publisher.WebDAVRequest(
+ request = z3c.dav.publisher.WebDAVRequest(
StringIO(body), {"CONTENT_TYPE": "text/xml",
"CONTENT_LENGTH": len(body)})
request.processInputs()
@@ -198,7 +198,7 @@
</propertyupdate>
"""
- request = zope.webdav.publisher.WebDAVRequest(
+ request = z3c.dav.publisher.WebDAVRequest(
StringIO(body), {"CONTENT_TYPE": "text/xml",
"CONTENT_LENGTH": len(body)})
request.processInputs()
@@ -216,7 +216,7 @@
</propertyupdate>
"""
- request = zope.webdav.publisher.WebDAVRequest(
+ request = z3c.dav.publisher.WebDAVRequest(
StringIO(body), {"CONTENT_TYPE": "text/xml",
"CONTENT_LENGTH": len(body)})
request.processInputs()
@@ -286,13 +286,13 @@
def test_error_set_prop(self):
class PROPPATCHHandlerError(PROPPATCHHandler):
def handleSet(self, prop):
- raise zope.webdav.interfaces.PropertyNotFound(
+ raise z3c.dav.interfaces.PropertyNotFound(
self.context, "getcontenttype", u"property is missing")
request = TestRequest(
set_properties = "<getcontenttype>text/plain</getcontenttype>")
propp = PROPPATCHHandlerError(Resource(), request)
- self.assertRaises(zope.webdav.interfaces.WebDAVPropstatErrors,
+ self.assertRaises(z3c.dav.interfaces.WebDAVPropstatErrors,
propp.PROPPATCH)
self.assertEqual(propp.setprops, [])
@@ -301,14 +301,14 @@
def test_error_set_prop_with_remove(self):
class PROPPATCHHandlerError(PROPPATCHHandler):
def handleSet(self, prop):
- raise zope.webdav.interfaces.PropertyNotFound(
+ raise z3c.dav.interfaces.PropertyNotFound(
self.context, "getcontenttype", u"property is missing")
request = TestRequest(
remove_properties = "<displayname>Test Name</displayname>",
set_properties = "<getcontenttype>text/plain</getcontenttype>")
propp = PROPPATCHHandlerError(Resource(), request)
- self.assertRaises(zope.webdav.interfaces.WebDAVPropstatErrors,
+ self.assertRaises(z3c.dav.interfaces.WebDAVPropstatErrors,
propp.PROPPATCH)
self.assertEqual(propp.setprops, [])
@@ -347,11 +347,11 @@
unauthprop = schema.TextLine(
title = u"Property that you are not allowed to set")
-exampleIntProperty = zope.webdav.properties.DAVProperty(
+exampleIntProperty = z3c.dav.properties.DAVProperty(
"{DAVtest:}exampleintprop", IExamplePropertyStorage)
-exampleTextProperty = zope.webdav.properties.DAVProperty(
+exampleTextProperty = z3c.dav.properties.DAVProperty(
"{DAVtest:}exampletextprop", IExamplePropertyStorage)
-unauthProperty = zope.webdav.properties.DAVProperty(
+unauthProperty = z3c.dav.properties.DAVProperty(
"{DAVtest:}unauthprop", IUnauthorizedPropertyStorage)
unauthProperty.restricted = True
@@ -402,29 +402,29 @@
gsm.registerUtility(exampleIntProperty,
name = "{DAVtest:}exampleintprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
gsm.registerUtility(exampleTextProperty,
name = "{DAVtest:}exampletextprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
exampleTextProperty.field.readonly = False
gsm.registerUtility(unauthProperty, name = "{DAVtest:}unauthprop")
gsm.registerAdapter(ExamplePropertyStorage,
- (IResource, zope.webdav.interfaces.IWebDAVRequest),
+ (IResource, z3c.dav.interfaces.IWebDAVRequest),
provided = IExamplePropertyStorage)
gsm.registerAdapter(UnauthorizedPropertyStorage,
- (IResource, zope.webdav.interfaces.IWebDAVRequest),
+ (IResource, z3c.dav.interfaces.IWebDAVRequest),
provided = IUnauthorizedPropertyStorage)
- gsm.registerAdapter(zope.webdav.widgets.IntDAVInputWidget,
+ gsm.registerAdapter(z3c.dav.widgets.IntDAVInputWidget,
(zope.schema.interfaces.IInt,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.registerAdapter(zope.webdav.widgets.TextDAVInputWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.registerAdapter(z3c.dav.widgets.TextDAVInputWidget,
(zope.schema.interfaces.IText,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
gsm.registerAdapter(DummyResourceURL,
- (IResource, zope.webdav.interfaces.IWebDAVRequest))
+ (IResource, z3c.dav.interfaces.IWebDAVRequest))
self.events = []
zope.event.subscribers.append(self.eventLog)
@@ -436,37 +436,37 @@
gsm.unregisterUtility(exampleIntProperty,
name = "{DAVtest:}exampleintprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
gsm.unregisterUtility(exampleTextProperty,
name = "{DAVtest:}exampletextprop",
- provided = zope.webdav.interfaces.IDAVProperty)
+ provided = z3c.dav.interfaces.IDAVProperty)
gsm.unregisterUtility(unauthProperty, name = "{DAVtest:}unauthprop")
gsm.unregisterAdapter(ExamplePropertyStorage,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest),
+ z3c.dav.interfaces.IWebDAVRequest),
provided = IExamplePropertyStorage)
gsm.unregisterAdapter(UnauthorizedPropertyStorage,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest),
+ z3c.dav.interfaces.IWebDAVRequest),
provided = IUnauthorizedPropertyStorage)
- gsm.unregisterAdapter(zope.webdav.widgets.IntDAVInputWidget,
+ gsm.unregisterAdapter(z3c.dav.widgets.IntDAVInputWidget,
(zope.schema.interfaces.IInt,
- zope.webdav.interfaces.IWebDAVRequest))
- gsm.unregisterAdapter(zope.webdav.widgets.TextDAVInputWidget,
+ z3c.dav.interfaces.IWebDAVRequest))
+ gsm.unregisterAdapter(z3c.dav.widgets.TextDAVInputWidget,
(zope.schema.interfaces.IText,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
gsm.unregisterAdapter(DummyResourceURL,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
self.events = []
zope.event.subscribers.remove(self.eventLog)
def test_handleSetProperty(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{DAVtest:}exampletextprop")
propel.text = "Example Text Prop"
@@ -474,12 +474,12 @@
set_properties = """<Dt:exampletextprop xmlns:Dt="DAVtest:">Example Text Prop</Dt:exampletextprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
self.assertEqual(propp.handleSet(propel), True)
self.assertEqual(resource.text, "Example Text Prop")
def test_handleSetProperty_samevalue(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{DAVtest:}exampletextprop")
propel.text = "Text Prop"
@@ -487,12 +487,12 @@
set_properties = """<Dt:exampletextprop xmlns:Dt="DAVtest:">Text Prop</Dt:exampletextprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
self.assertEqual(propp.handleSet(propel), False)
self.assertEqual(resource.text, "Text Prop")
def test_handleSet_forbidden_property(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{DAVtest:}exampletextprop")
propel.text = "Example Text Prop"
@@ -502,13 +502,13 @@
set_properties = """<Dt:exampletextprop xmlns:Dt="DAVtest:">Example Text Prop</Dt:exampletextprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
- self.assertRaises(zope.webdav.interfaces.ForbiddenError,
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
+ self.assertRaises(z3c.dav.interfaces.ForbiddenError,
propp.handleSet,
propel)
def test_handleSet_unauthorized(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{DAVtest:}unauthprop")
propel.text = "Example Text Prop"
@@ -516,11 +516,11 @@
set_properties = """<Dt:unauthprop xmlns:Dt="DAVtest:">Example Text Prop</Dt:unauthprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
self.assertRaises(Unauthorized, propp.handleSet, propel)
def test_handleSet_property_notfound(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{DAVtest:}exampletextpropmissing")
propel.text = "Example Text Prop"
@@ -528,13 +528,13 @@
set_properties = """<Dt:exampletextprop xmlns:Dt="DAVtest:">Example Text Prop</Dt:exampletextprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
- self.assertRaises(zope.webdav.interfaces.PropertyNotFound,
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
+ self.assertRaises(z3c.dav.interfaces.PropertyNotFound,
propp.handleSet,
propel)
def test_handleRemove_live_property(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{DAVtest:}exampletextprop")
propel.text = "Example Text Prop"
@@ -542,13 +542,13 @@
remove_properties = """<Dt:exampletextprop xmlns:Dt="DAVtest:">Example Text Prop</Dt:exampletextprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
- self.assertRaises(zope.webdav.interfaces.ConflictError,
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
+ self.assertRaises(z3c.dav.interfaces.ConflictError,
propp.handleRemove,
propel)
def test_handleRemove_no_dead_properties(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{example:}exampledeadprop")
propel.text = "Example Text Prop"
@@ -556,8 +556,8 @@
remove_properties = """<Dt:exampletextprop xmlns:Dt="DAVtest:">Example Text Prop</Dt:exampletextprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
- self.assertRaises(zope.webdav.interfaces.ConflictError,
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
+ self.assertRaises(z3c.dav.interfaces.ConflictError,
propp.handleRemove,
propel)
@@ -566,7 +566,7 @@
set_properties = """<Dt:exampletextprop xmlns:Dt="DAVtest:">Example Text Prop</Dt:exampletextprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
propp.PROPPATCH()
self.assertEqual(resource.text, "Example Text Prop") # property modified
@@ -579,7 +579,7 @@
set_properties = """<Dt:exampletextprop xmlns:Dt="DAVtest:">Text Prop</Dt:exampletextprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
propp.PROPPATCH()
self.assertEqual(resource.text, "Text Prop")
@@ -593,7 +593,7 @@
""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
propp.PROPPATCH()
self.assertEqual(resource.text, "Text Prop")
@@ -604,7 +604,7 @@
class DEADProperties(object):
- interface.implements(zope.webdav.interfaces.IOpaquePropertyStorage)
+ interface.implements(z3c.dav.interfaces.IOpaquePropertyStorage)
def __init__(self, context):
self.data = context.props = getattr(context, "props", {})
@@ -639,7 +639,7 @@
gsm.registerAdapter(DEADProperties, (IResource,))
gsm.registerAdapter(DummyResourceURL,
- (IResource, zope.webdav.interfaces.IWebDAVRequest))
+ (IResource, z3c.dav.interfaces.IWebDAVRequest))
self.events = []
zope.event.subscribers.append(self.eventLog)
@@ -653,13 +653,13 @@
gsm.unregisterAdapter(DummyResourceURL,
(IResource,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
self.events = []
zope.event.subscribers.remove(self.eventLog)
def test_remove_no_storage(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{example:}exampledeadprop")
propel.text = "Example Text Prop"
@@ -667,13 +667,13 @@
remove_properties = """<Dt:exampledeadprop xmlns:Dt="example:">Example Text Prop</Dt:exampledeadprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
- self.assertRaises(zope.webdav.interfaces.ConflictError,
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
+ self.assertRaises(z3c.dav.interfaces.ConflictError,
propp.handleRemove,
propel)
def test_remove_not_there(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{example:}exampledeadprop")
propel.text = "Example Text Prop"
@@ -681,14 +681,14 @@
remove_properties = """<Dt:exampletextprop xmlns:Dt="DAVtest:">Example Text Prop</Dt:exampletextprop>""")
resource = Resource("Text Prop", 10)
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
- self.assertRaises(zope.webdav.interfaces.ConflictError,
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
+ self.assertRaises(z3c.dav.interfaces.ConflictError,
propp.handleRemove,
propel)
self.assertEqual(self.events, [])
def test_remove_prop(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
propel = etree.Element("{example:}exampledeadprop")
propel.text = "Example Text Prop"
@@ -703,7 +703,7 @@
self.assertEqual(deadprops.hasProperty(testprop), True)
self.assertEqual(deadprops.getProperty(testprop), "Example Text Prop")
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
self.assertEqual(propp.handleRemove(propel), True)
self.assertEqual(deadprops.hasProperty(testprop), False)
@@ -718,7 +718,7 @@
deadprops = DEADProperties(resource)
deadprops.setProperty(testprop, "Example Text Prop")
- propp = zope.webdav.proppatch.PROPPATCH(resource, request)
+ propp = z3c.dav.proppatch.PROPPATCH(resource, request)
propp.PROPPATCH()
self.assertEqual(deadprops.hasProperty(testprop), False)
Modified: z3c.dav/trunk/src/z3c/dav/tests/test_publisher.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_publisher.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_publisher.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -22,11 +22,11 @@
from zope.interface.verify import verifyObject
-from zope.webdav.publisher import WebDAVRequest
-from zope.webdav.interfaces import IWebDAVRequest, IWebDAVResponse, BadRequest
+from z3c.dav.publisher import WebDAVRequest
+from z3c.dav.interfaces import IWebDAVRequest, IWebDAVResponse, BadRequest
-from zope.etree.testing import etreeSetup
-from zope.etree.testing import etreeTearDown
+from z3c.etree.testing import etreeSetup
+from z3c.etree.testing import etreeTearDown
def create_request(body = None, env = {}):
if isinstance(body, types.StringTypes):
Modified: z3c.dav/trunk/src/z3c/dav/tests/test_widgets.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_widgets.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_widgets.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -27,10 +27,10 @@
from zope.interface.verify import verifyObject
from zope.datetime import tzinfo
-from zope.webdav import widgets
-import zope.webdav.interfaces
-from zope.webdav.publisher import WebDAVRequest
-from zope.etree.testing import etreeSetup, etreeTearDown, assertXMLEqual
+from z3c.dav import widgets
+import z3c.dav.interfaces
+from z3c.dav.publisher import WebDAVRequest
+from z3c.etree.testing import etreeSetup, etreeTearDown, assertXMLEqual
class TestWebDAVRequest(WebDAVRequest):
@@ -125,7 +125,7 @@
def test_interface(self):
self.assertEqual(
- verifyObject(zope.webdav.interfaces.IDAVWidget, self.widget), True)
+ verifyObject(z3c.dav.interfaces.IDAVWidget, self.widget), True)
def test_render(self):
self.widget.setRenderedValue(self.field_content)
@@ -269,7 +269,7 @@
component.getGlobalSiteManager().registerAdapter(
widgets.TextDAVWidget,
(zope.schema.interfaces.ITextLine,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
foofield = schema.List(__name__ = self.name,
title = u"Foo Title",
@@ -295,7 +295,7 @@
component.getGlobalSiteManager().unregisterAdapter(
widgets.TextDAVWidget,
(zope.schema.interfaces.ITextLine,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
super(ListTextWebDAVWidgetTest, self).tearDown()
@@ -348,21 +348,21 @@
component.getGlobalSiteManager().registerAdapter(
widgets.TextDAVWidget,
(zope.schema.interfaces.ITextLine,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
component.getGlobalSiteManager().registerAdapter(
widgets.IntDAVWidget,
(zope.schema.interfaces.IInt,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
def tearDown(self):
component.getGlobalSiteManager().unregisterAdapter(
widgets.TextDAVWidget,
(zope.schema.interfaces.ITextLine,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
component.getGlobalSiteManager().unregisterAdapter(
widgets.IntDAVWidget,
(zope.schema.interfaces.IInt,
- zope.webdav.interfaces.IWebDAVRequest))
+ z3c.dav.interfaces.IWebDAVRequest))
super(ObjectDAVWidgetTest, self).tearDown()
def test_default_render_missing_values(self):
Modified: z3c.dav/trunk/src/z3c/dav/tests/utils.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/utils.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/tests/utils.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -17,7 +17,7 @@
__docformat__ = 'restructuredtext'
from zope.publisher.http import status_reasons
-from zope.etree.testing import assertXMLEqual
+from z3c.etree.testing import assertXMLEqual
class TestMultiStatusBody(object):
#
@@ -36,7 +36,7 @@
# - tag -
# - text_value -
# - propelement - etree Element that we compare with the property
- # using zope.webdav.testing.assertXMLEqual
+ # using z3c.etree.testing.assertXMLEqual
self.assertEqual(response.tag, "{DAV:}response")
# set to true if we found the property, under the correct status code
Modified: z3c.dav/trunk/src/z3c/dav/utils.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/utils.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/utils.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -10,7 +10,7 @@
# FOR A PARTICULAR PURPOSE.
##############################################################################
"""A collection of useful classes used for generating common XML fragments
-for use within zope.webdav
+for use within z3c.dav
MultiStatus
@@ -38,7 +38,7 @@
from zope.publisher.http import status_reasons
from zope.traversing.browser.interfaces import IAbsoluteURL
from zope.app.container.interfaces import IReadContainer
-from zope.etree.interfaces import IEtree
+import z3c.etree
class IPropstat(interface.Interface):
"""Helper interface to render a response XML element.
@@ -139,7 +139,7 @@
################################################################################
def makeelement(namespace, tagname, text_or_el = None):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
el = etree.Element(etree.QName(namespace, tagname))
if isinstance(text_or_el, (str, unicode)):
el.text = text_or_el
@@ -628,7 +628,7 @@
self.responsedescription = ""
def __call__(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
el = etree.Element(etree.QName('DAV:', 'multistatus'))
for response in self.responses:
el.append(response())
Modified: z3c.dav/trunk/src/z3c/dav/widgets.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/widgets.py 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/widgets.py 2007-05-02 18:42:54 UTC (rev 75023)
@@ -22,7 +22,7 @@
from zope import interface
from zope.schema import getFieldsInOrder
-from zope.etree.interfaces import IEtree
+import z3c.etree
import interfaces
import zope.datetime
@@ -59,7 +59,7 @@
"please implemented this method in a subclass of DAVWidget."
def render(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
el = etree.Element(etree.QName(self.namespace, self.name))
rendered_value = self.toDAVValue(self._value)
@@ -136,7 +136,7 @@
render_missing_values = True
def render(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
el = etree.Element(etree.QName(self.namespace, self.name))
if self._value is None:
@@ -167,7 +167,7 @@
interface.classProvides(interfaces.IIDAVWidget)
def render(self):
- etree = component.getUtility(IEtree)
+ etree = z3c.etree.getEngine()
el = etree.Element(etree.QName(self.namespace, self.name))
if self._value is None:
Modified: z3c.dav/trunk/src/z3c/dav/z3-configure.zcml
===================================================================
--- z3c.dav/trunk/src/z3c/dav/z3-configure.zcml 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/z3-configure.zcml 2007-05-02 18:42:54 UTC (rev 75023)
@@ -60,14 +60,14 @@
<adapter
factory=".lockingutils.DAVActiveLock"
for="zope.interface.Interface
- zope.webdav.interfaces.IWebDAVRequest"
- provides="zope.webdav.coreproperties.IActiveLock"
+ z3c.dav.interfaces.IWebDAVRequest"
+ provides="z3c.dav.coreproperties.IActiveLock"
/>
<class class=".lockingutils.DAVActiveLockAdapter">
<require
permission="zope.View"
- interface="zope.webdav.coreproperties.IActiveLock"
+ interface="z3c.dav.coreproperties.IActiveLock"
/>
</class>
Modified: z3c.dav/trunk/src/z3c/dav/zope.webdav-configure.zcml
===================================================================
--- z3c.dav/trunk/src/z3c/dav/zope.webdav-configure.zcml 2007-05-02 18:16:25 UTC (rev 75022)
+++ z3c.dav/trunk/src/z3c/dav/zope.webdav-configure.zcml 2007-05-02 18:42:54 UTC (rev 75023)
@@ -1 +1 @@
-<include package="zope.webdav" />
+<include package="z3c.dav" />
More information about the Checkins
mailing list