[CalendarServer-changes] [5161] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sat Feb 20 08:21:41 PST 2010
Revision: 5161
http://trac.macosforge.org/projects/calendarserver/changeset/5161
Author: wsanchez at apple.com
Date: 2010-02-20 08:21:37 -0800 (Sat, 20 Feb 2010)
Log Message:
-----------
ErrorResponse is a Response, not an element, so it makes no sense for it to live in davxml.
Don't define elements at the top davxml module.
Modified Paths:
--------------
CalendarServer/trunk/twext/web2/dav/davxml.py
CalendarServer/trunk/twext/web2/dav/element/extensions.py
CalendarServer/trunk/twext/web2/dav/http.py
CalendarServer/trunk/twistedcaldav/dropbox.py
CalendarServer/trunk/twistedcaldav/freebusyurl.py
CalendarServer/trunk/twistedcaldav/method/copymove.py
CalendarServer/trunk/twistedcaldav/method/delete_common.py
CalendarServer/trunk/twistedcaldav/method/mkcalendar.py
CalendarServer/trunk/twistedcaldav/method/put.py
CalendarServer/trunk/twistedcaldav/method/put_common.py
CalendarServer/trunk/twistedcaldav/method/report.py
CalendarServer/trunk/twistedcaldav/method/report_calquery.py
CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
CalendarServer/trunk/twistedcaldav/method/report_multiget.py
CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py
CalendarServer/trunk/twistedcaldav/resource.py
CalendarServer/trunk/twistedcaldav/schedule.py
CalendarServer/trunk/twistedcaldav/scheduling/caldav.py
CalendarServer/trunk/twistedcaldav/scheduling/imip.py
CalendarServer/trunk/twistedcaldav/scheduling/implicit.py
CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py
CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py
CalendarServer/trunk/twistedcaldav/static.py
CalendarServer/trunk/twistedcaldav/timezoneservice.py
Removed Paths:
-------------
CalendarServer/trunk/twext/web2/dav/_errorbase.py
Deleted: CalendarServer/trunk/twext/web2/dav/_errorbase.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/_errorbase.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twext/web2/dav/_errorbase.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -1,67 +0,0 @@
-##
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-##
-
-"""
-This module provides a point to avoid a circular dependency between the davxml
-and http modules.
-"""
-
-from twext.web2.http_headers import MimeType
-from twext.web2.http import Response
-
-class ErrorResponse (Response):
- """
- A L{Response} object which contains a status code and a L{davxml.Error}
- element.
- Renders itself as a DAV:error XML document.
- """
- error = None
-
- def __init__(self, code, error, stream=None):
- """
- @param code: a response code.
- @param error: an L{davxml.WebDAVElement} identifying the error, or a
- tuple C{(namespace, name)} with which to create an empty element
- denoting the error. (The latter is useful in the case of
- preconditions ans postconditions, not all of which have defined
- XML element classes.)
- """
- from twext.web2.dav import davxml
-
- if type(error) is tuple:
- xml_namespace, xml_name = error
- error = davxml.WebDAVUnknownElement()
- error.namespace = xml_namespace
- error.name = xml_name
-
- if stream is None:
- stream = davxml.Error(error).toxml()
-
- Response.__init__(self, code=code, stream=stream)
-
- self.headers.setHeader("content-type", MimeType("text", "xml"))
-
- self.error = error
-
- def __repr__(self):
- return "<%s %s %s>" % (self.__class__.__name__, self.code, self.error.sname())
Modified: CalendarServer/trunk/twext/web2/dav/davxml.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/davxml.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twext/web2/dav/davxml.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -72,20 +72,10 @@
[
"sname2qname",
"qname2sname",
- "ErrorDescription",
- "ErrorResponse",
- "SyncCollection",
- "SyncToken",
]
)
-#from twext.web2.http import Response
-from twext.web2.dav._errorbase import ErrorResponse as SuperErrorResponse
-from twext.web2.dav.davxml import dav_namespace, twisted_dav_namespace, WebDAVElement, WebDAVTextElement
-from twext.web2.dav.davxml import WebDAVUnknownElement, Error
-
-
def sname2qname(sname):
"""
Convert an sname into a qname.
@@ -123,101 +113,3 @@
except TypeError:
raise ValueError("Invalid qname: %r" % (qname,))
-
-
-
-
-class ErrorDescription(WebDAVTextElement):
- """
- The human-readable description of a failed precondition
- """
- namespace = twisted_dav_namespace
- name = "error-description"
- protected = True
-
-
-class ErrorResponse(SuperErrorResponse):
- """
- A L{Response} object which contains a status code and a L{davxml.Error}
- element.
- Renders itself as a DAV:error XML document.
- """
- error = None
- unregistered = True # base class is already registered
-
- def __init__(self, code, error, description=None):
- """
- @param code: a response code.
- @param error: an L{davxml.WebDAVElement} identifying the error, or a
- tuple C{(namespace, name)} with which to create an empty element
- denoting the error. (The latter is useful in the case of
- preconditions ans postconditions, not all of which have defined
- XML element classes.)
- @param description: an optional string that, if present, will get
- wrapped in a (twisted_dav_namespace, error-description) element.
- """
- if type(error) is tuple:
- xml_namespace, xml_name = error
- error = WebDAVUnknownElement()
- error.namespace = xml_namespace
- error.name = xml_name
-
- if description:
- output = Error(error, ErrorDescription(description)).toxml()
- else:
- output = Error(error).toxml()
-
- SuperErrorResponse.__init__(self, code=code, error=error, stream=output)
-
-
- def __repr__(self):
- return "<%s %s %s>" % (self.__class__.__name__, self.code, self.error.sname())
-
-class SyncCollection (WebDAVElement):
- """
- DAV report used to retrieve specific calendar component items via their
- URIs.
- (CalDAV-access-09, section 9.9)
- """
- name = "sync-collection"
-
- # To allow for an empty element in a supported-report-set property we need
- # to relax the child restrictions
- allowed_children = {
- (dav_namespace, "sync-token"): (0, 1), # When used in the REPORT this is required
- (dav_namespace, "prop" ): (0, 1),
- }
-
- def __init__(self, *children, **attributes):
- super(SyncCollection, self).__init__(*children, **attributes)
-
- self.property = None
- self.sync_token = None
-
- for child in self.children:
- qname = child.qname()
-
- if qname == (dav_namespace, "sync-token"):
-
- self.sync_token = str(child)
-
- elif qname in (
- (dav_namespace, "prop" ),
- ):
- if self.property is not None:
- raise ValueError("Only one of DAV:prop allowed")
- self.property = child
-
-registerElement(SyncCollection)
-
-class SyncToken (WebDAVTextElement):
- """
- Synchronization token used in report and as a property.
- """
- name = "sync-token"
- hidden = True
- protected = True
-
-registerElement(SyncToken)
-
-
Modified: CalendarServer/trunk/twext/web2/dav/element/extensions.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/element/extensions.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twext/web2/dav/element/extensions.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -28,9 +28,15 @@
Implementation of draft-sanchez-webdav-current-principal-02.
"""
-__all__ = ['CurrentUserPrincipal']
+__all__ = [
+ "CurrentUserPrincipal",
+ "ErrorDescription",
+ "SyncCollection",
+ "SyncToken",
+]
-from twext.web2.dav.element.base import WebDAVElement, dav_namespace
+from twext.web2.dav.element.base import WebDAVElement, WebDAVTextElement
+from twext.web2.dav.element.base import dav_namespace, twisted_dav_namespace
class CurrentUserPrincipal(WebDAVElement):
@@ -43,3 +49,54 @@
(dav_namespace, "href" ) : (0, 1),
(dav_namespace, "unauthenticated" ) : (0, 1),
}
+
+class ErrorDescription(WebDAVTextElement):
+ """
+ The human-readable description of a failed precondition
+ """
+ namespace = twisted_dav_namespace
+ name = "error-description"
+ protected = True
+
+class SyncCollection (WebDAVElement):
+ """
+ DAV report used to retrieve specific calendar component items via their
+ URIs.
+ (CalDAV-access-09, section 9.9)
+ """
+ name = "sync-collection"
+
+ # To allow for an empty element in a supported-report-set property we need
+ # to relax the child restrictions
+ allowed_children = {
+ (dav_namespace, "sync-token"): (0, 1), # When used in the REPORT this is required
+ (dav_namespace, "prop" ): (0, 1),
+ }
+
+ def __init__(self, *children, **attributes):
+ super(SyncCollection, self).__init__(*children, **attributes)
+
+ self.property = None
+ self.sync_token = None
+
+ for child in self.children:
+ qname = child.qname()
+
+ if qname == (dav_namespace, "sync-token"):
+
+ self.sync_token = str(child)
+
+ elif qname in (
+ (dav_namespace, "prop" ),
+ ):
+ if self.property is not None:
+ raise ValueError("Only one of DAV:prop allowed")
+ self.property = child
+
+class SyncToken (WebDAVTextElement):
+ """
+ Synchronization token used in report and as a property.
+ """
+ name = "sync-token"
+ hidden = True
+ protected = True
Modified: CalendarServer/trunk/twext/web2/dav/http.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/http.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twext/web2/dav/http.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -49,8 +49,47 @@
from twext.web2.dav import davxml
from twext.web2.dav.util import joinURL
-from twext.web2.dav._errorbase import ErrorResponse
+class ErrorResponse(Response):
+ """
+ A L{Response} object which contains a status code and a L{davxml.Error}
+ element.
+ Renders itself as a DAV:error XML document.
+ """
+ error = None
+ unregistered = True # base class is already registered
+ def __init__(self, code, error, description=None):
+ """
+ @param code: a response code.
+ @param error: an L{davxml.WebDAVElement} identifying the error, or a
+ tuple C{(namespace, name)} with which to create an empty element
+ denoting the error. (The latter is useful in the case of
+ preconditions ans postconditions, not all of which have defined
+ XML element classes.)
+ @param description: an optional string that, if present, will get
+ wrapped in a (twisted_dav_namespace, error-description) element.
+ """
+ if type(error) is tuple:
+ xml_namespace, xml_name = error
+ error = davxml.WebDAVUnknownElement()
+ error.namespace = xml_namespace
+ error.name = xml_name
+
+ if description:
+ output = davxml.Error(error, davxml.ErrorDescription(description)).toxml()
+ else:
+ output = davxml.Error(error).toxml()
+
+ Response.__init__(self, code=code, stream=output)
+
+ self.headers.setHeader("content-type", MimeType("text", "xml"))
+
+ self.error = error
+
+
+ def __repr__(self):
+ return "<%s %s %s>" % (self.__class__.__name__, self.code, self.error.sname())
+
class NeedPrivilegesResponse (ErrorResponse):
def __init__(self, base_uri, errors):
"""
Modified: CalendarServer/trunk/twistedcaldav/dropbox.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/dropbox.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/dropbox.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -23,7 +23,7 @@
"DropBoxCollectionResource",
]
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twext.web2 import responsecode
from twext.web2.dav import davxml
from twext.web2.dav.resource import DAVResource, TwistedACLInheritable
Modified: CalendarServer/trunk/twistedcaldav/freebusyurl.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/freebusyurl.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/freebusyurl.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -26,7 +26,7 @@
from twisted.python import log
from twext.web2 import responsecode
from twext.web2.dav import davxml
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twext.web2.http import HTTPError
from twext.web2.http import Response
from twext.web2.http import StatusResponse
Modified: CalendarServer/trunk/twistedcaldav/method/copymove.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/copymove.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/copymove.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -26,7 +26,7 @@
from twext.web2 import responsecode
from twext.web2.filter.location import addLocation
from twext.web2.dav import davxml
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.util import parentForURL
from twext.web2.http import StatusResponse, HTTPError
Modified: CalendarServer/trunk/twistedcaldav/method/delete_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/delete_common.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/delete_common.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -29,7 +29,7 @@
from twext.web2.http import HTTPError, StatusResponse
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twistedcaldav.caldavxml import caldav_namespace, ScheduleTag
from twistedcaldav.config import config
Modified: CalendarServer/trunk/twistedcaldav/method/mkcalendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/mkcalendar.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/mkcalendar.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -30,7 +30,7 @@
from twext.web2.http import HTTPError, StatusResponse
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twistedcaldav import caldavxml
Modified: CalendarServer/trunk/twistedcaldav/method/put.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/put.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/put.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -26,7 +26,7 @@
from twext.web2.http import HTTPError, StatusResponse
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twistedcaldav.caldavxml import caldav_namespace
Modified: CalendarServer/trunk/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/put_common.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/put_common.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -45,7 +45,7 @@
from twext.web2.stream import MemoryStream
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twistedcaldav.config import config
from twistedcaldav.caldavxml import NoUIDConflict, ScheduleTag
Modified: CalendarServer/trunk/twistedcaldav/method/report.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/report.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -36,7 +36,7 @@
from twext.web2.dav.util import davXMLFromStream
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twistedcaldav import caldavxml
Modified: CalendarServer/trunk/twistedcaldav/method/report_calquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_calquery.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/report_calquery.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -23,7 +23,7 @@
import urllib
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twisted.internet.defer import succeed, inlineCallbacks, returnValue
from twext.web2 import responsecode
Modified: CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_freebusy.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/report_freebusy.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -21,7 +21,7 @@
__all__ = ["report_urn_ietf_params_xml_ns_caldav_free_busy_query"]
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.web2 import responsecode
Modified: CalendarServer/trunk/twistedcaldav/method/report_multiget.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_multiget.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/report_multiget.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -23,7 +23,7 @@
from urllib import unquote
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.web2 import responsecode
Modified: CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -21,7 +21,8 @@
__all__ = ["report_DAV__sync_collection"]
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse, SyncToken
+from twext.web2.dav.davxml import SyncToken
+from twext.web2.dav.http import ErrorResponse
from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.python.failure import Failure
Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -36,7 +36,8 @@
from zope.interface import implements
from twext.python.log import LoggingMixIn
-from twext.web2.dav.davxml import ErrorResponse, SyncCollection
+from twext.web2.dav.davxml import SyncCollection
+from twext.web2.dav.http import ErrorResponse
from twisted.internet import reactor
from twisted.internet.defer import Deferred, maybeDeferred, succeed
Modified: CalendarServer/trunk/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/schedule.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/schedule.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -24,7 +24,7 @@
"IScheduleInboxResource",
]
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.web2 import responsecode
Modified: CalendarServer/trunk/twistedcaldav/scheduling/caldav.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/caldav.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/scheduling/caldav.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -22,7 +22,7 @@
from md5 import new as md5
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.python.failure import Failure
Modified: CalendarServer/trunk/twistedcaldav/scheduling/imip.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/imip.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/scheduling/imip.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -18,7 +18,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twext.web2 import responsecode
from twext.web2.http import HTTPError
Modified: CalendarServer/trunk/twistedcaldav/scheduling/implicit.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/implicit.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/scheduling/implicit.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -15,7 +15,7 @@
##
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.web2 import responsecode
Modified: CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -32,7 +32,7 @@
from twext.python.log import Logger, logLevels
from twext.internet.ssl import ChainingOpenSSLContextFactory
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twistedcaldav import caldavxml
from twistedcaldav.caldavxml import caldav_namespace
Modified: CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -15,7 +15,7 @@
##
from twext.python.log import Logger, LoggingMixIn
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.python.failure import Failure
Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/static.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -45,7 +45,7 @@
from uuid import uuid4
from twext.python.log import Logger
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twisted.internet.defer import fail, succeed, inlineCallbacks, returnValue, maybeDeferred
from twisted.python.failure import Failure
Modified: CalendarServer/trunk/twistedcaldav/timezoneservice.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezoneservice.py 2010-02-20 15:41:23 UTC (rev 5160)
+++ CalendarServer/trunk/twistedcaldav/timezoneservice.py 2010-02-20 16:21:37 UTC (rev 5161)
@@ -22,7 +22,7 @@
"TimezoneServiceResource",
]
-from twext.web2.dav.davxml import ErrorResponse
+from twext.web2.dav.http import ErrorResponse
from twext.web2 import responsecode
from twext.web2.dav import davxml
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100220/ac017e92/attachment-0001.html>
More information about the calendarserver-changes
mailing list