[CalendarServer-changes] [8908] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sat Mar 17 23:48:28 PDT 2012
Revision: 8908
http://trac.macosforge.org/projects/calendarserver/changeset/8908
Author: wsanchez at apple.com
Date: 2012-03-17 23:48:27 -0700 (Sat, 17 Mar 2012)
Log Message:
-----------
Remove twext.web2.dav.davxml and update imports.
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/accesslog.py
CalendarServer/trunk/calendarserver/provision/root.py
CalendarServer/trunk/calendarserver/provision/test/test_root.py
CalendarServer/trunk/calendarserver/push/applepush.py
CalendarServer/trunk/calendarserver/tools/gateway.py
CalendarServer/trunk/calendarserver/tools/principals.py
CalendarServer/trunk/calendarserver/tools/purge.py
CalendarServer/trunk/calendarserver/webadmin/resource.py
CalendarServer/trunk/calendarserver/webcal/resource.py
CalendarServer/trunk/twext/web2/dav/__init__.py
CalendarServer/trunk/twext/web2/dav/method/acl.py
CalendarServer/trunk/twext/web2/dav/method/copymove.py
CalendarServer/trunk/twext/web2/dav/method/delete.py
CalendarServer/trunk/twext/web2/dav/method/get.py
CalendarServer/trunk/twext/web2/dav/method/mkcol.py
CalendarServer/trunk/twext/web2/dav/method/propfind.py
CalendarServer/trunk/twext/web2/dav/method/proppatch.py
CalendarServer/trunk/twext/web2/dav/method/put.py
CalendarServer/trunk/twext/web2/dav/method/put_common.py
CalendarServer/trunk/twext/web2/dav/method/report.py
CalendarServer/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py
CalendarServer/trunk/twext/web2/dav/method/report_principal_search_property_set.py
CalendarServer/trunk/twext/web2/dav/test/test_prop.py
CalendarServer/trunk/twext/web2/dav/test/test_quota.py
CalendarServer/trunk/twext/web2/dav/test/test_report.py
CalendarServer/trunk/twext/web2/dav/test/test_resource.py
CalendarServer/trunk/twext/web2/dav/test/test_static.py
CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py
CalendarServer/trunk/twistedcaldav/directory/principal.py
CalendarServer/trunk/twistedcaldav/directory/test/test_calendar.py
CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py
CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py
CalendarServer/trunk/twistedcaldav/directory/wiki.py
CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py
CalendarServer/trunk/twistedcaldav/dropbox.py
CalendarServer/trunk/twistedcaldav/freebusyurl.py
CalendarServer/trunk/twistedcaldav/linkresource.py
CalendarServer/trunk/twistedcaldav/mail.py
CalendarServer/trunk/twistedcaldav/method/copymove.py
CalendarServer/trunk/twistedcaldav/method/copymove_contact.py
CalendarServer/trunk/twistedcaldav/method/delete.py
CalendarServer/trunk/twistedcaldav/method/get.py
CalendarServer/trunk/twistedcaldav/method/mkcalendar.py
CalendarServer/trunk/twistedcaldav/method/mkcol.py
CalendarServer/trunk/twistedcaldav/method/propfind.py
CalendarServer/trunk/twistedcaldav/method/put_addressbook_common.py
CalendarServer/trunk/twistedcaldav/method/put_common.py
CalendarServer/trunk/twistedcaldav/method/report.py
CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py
CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py
CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py
CalendarServer/trunk/twistedcaldav/mkcolxml.py
CalendarServer/trunk/twistedcaldav/notifications.py
CalendarServer/trunk/twistedcaldav/schedule.py
CalendarServer/trunk/twistedcaldav/scheduling/caldav.py
CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py
CalendarServer/trunk/twistedcaldav/simpleresource.py
CalendarServer/trunk/twistedcaldav/stdconfig.py
CalendarServer/trunk/twistedcaldav/storebridge.py
CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py
CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py
CalendarServer/trunk/twistedcaldav/test/test_cache.py
CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py
CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py
CalendarServer/trunk/twistedcaldav/test/test_multiget.py
CalendarServer/trunk/twistedcaldav/test/test_props.py
CalendarServer/trunk/twistedcaldav/test/test_schedule.py
CalendarServer/trunk/twistedcaldav/test/test_sharing.py
CalendarServer/trunk/twistedcaldav/test/test_wrapping.py
CalendarServer/trunk/twistedcaldav/test/util.py
CalendarServer/trunk/twistedcaldav/timezoneservice.py
CalendarServer/trunk/twistedcaldav/timezonestdservice.py
CalendarServer/trunk/twistedcaldav/timezonexml.py
CalendarServer/trunk/txdav/base/propertystore/base.py
CalendarServer/trunk/txdav/base/propertystore/test/base.py
CalendarServer/trunk/txdav/caldav/datastore/file.py
CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py
CalendarServer/trunk/txdav/common/datastore/test/test_sql.py
CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py
Modified: CalendarServer/trunk/calendarserver/accesslog.py
===================================================================
--- CalendarServer/trunk/calendarserver/accesslog.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/calendarserver/accesslog.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -32,7 +32,7 @@
from twisted.internet import protocol
from twisted.protocols import amp
from twext.web2 import iweb
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.log import BaseCommonAccessLoggingObserver
from twext.web2.log import LogWrapperResource
Modified: CalendarServer/trunk/calendarserver/provision/root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/root.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/calendarserver/provision/root.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -22,7 +22,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
from twext.web2.auth.wrapper import UnauthorizedResponse
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.xattrprops import xattrPropertyStore
from twext.web2.http import HTTPError, StatusResponse, RedirectResponse
Modified: CalendarServer/trunk/calendarserver/provision/test/test_root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/test/test_root.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/calendarserver/provision/test/test_root.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -24,7 +24,7 @@
from twext.web2 import server
from twext.web2.auth import basic
from twext.web2.dav import auth
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.http import HTTPError
from twext.web2.iweb import IResponse
from twext.web2.test.test_server import SimpleRequest
Modified: CalendarServer/trunk/calendarserver/push/applepush.py
===================================================================
--- CalendarServer/trunk/calendarserver/push/applepush.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/calendarserver/push/applepush.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -18,7 +18,7 @@
from twext.python.log import Logger, LoggingMixIn
from twext.python.log import LoggingMixIn
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.noneprops import NonePropertyStore
from twext.web2.dav.resource import DAVResource
from twext.web2.http import Response
Modified: CalendarServer/trunk/calendarserver/tools/gateway.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/gateway.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/calendarserver/tools/gateway.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -30,7 +30,7 @@
from twisted.python.util import switchUID
from twistedcaldav.config import config, ConfigurationError
from twistedcaldav.directory.directory import DirectoryError
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from calendarserver.tools.util import loadConfig, getDirectory, setupMemcached, checkDirectory
from calendarserver.tools.principals import (
Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/calendarserver/tools/principals.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -27,7 +27,7 @@
from twisted.python.util import switchUID
from twisted.internet import reactor
from twisted.internet.defer import inlineCallbacks, returnValue
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.python.log import clearLogLevels
from twext.python.log import StandardIOObserver
Modified: CalendarServer/trunk/calendarserver/tools/purge.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/purge.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/calendarserver/tools/purge.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -29,7 +29,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.python.log import Logger
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.responsecode import NO_CONTENT
from twistedcaldav import caldavxml
Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/resource.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -43,7 +43,7 @@
from zope.interface.declarations import implements
from twext.web2.stream import MemoryStream
from twext.web2.http import HTTPError
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twisted.web.iweb import ITemplateLoader
from twisted.web.template import (
Modified: CalendarServer/trunk/calendarserver/webcal/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webcal/resource.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/calendarserver/webcal/resource.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -32,7 +32,7 @@
from twext.web2.http import Response
from twext.web2.http_headers import MimeType
from twext.web2.stream import MemoryStream
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.resource import TwistedACLInheritable
from twistedcaldav.config import config
Modified: CalendarServer/trunk/twext/web2/dav/__init__.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/__init__.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/__init__.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -51,5 +51,3 @@
"util",
"xattrprops",
]
-
-import txdav.xml.element as davxml
Modified: CalendarServer/trunk/twext/web2/dav/method/acl.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/acl.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/acl.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -34,7 +34,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
from twext.web2.http import StatusResponse, HTTPError
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.util import davXMLFromStream
Modified: CalendarServer/trunk/twext/web2/dav/method/copymove.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/copymove.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/copymove.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -36,7 +36,7 @@
from twext.web2.dav.fileop import move
from twext.web2.http import HTTPError, StatusResponse
from twext.web2.filter.location import addLocation
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.idav import IDAVResource
from twext.web2.dav.method import put_common
from twext.web2.dav.util import parentForURL
Modified: CalendarServer/trunk/twext/web2/dav/method/delete.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/delete.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/delete.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -34,7 +34,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
from twext.web2.http import HTTPError
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.method.delete_common import deleteResource
from twext.web2.dav.util import parentForURL
Modified: CalendarServer/trunk/twext/web2/dav/method/get.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/get.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/get.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -31,7 +31,7 @@
import twext
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.util import parentForURL
def http_OPTIONS(self, request):
Modified: CalendarServer/trunk/twext/web2/dav/method/mkcol.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/mkcol.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/mkcol.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -34,7 +34,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.fileop import mkcollection
from twext.web2.dav.util import noDataFromStream, parentForURL
Modified: CalendarServer/trunk/twext/web2/dav/method/propfind.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/propfind.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/propfind.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -39,7 +39,7 @@
from twext.web2.http import HTTPError
from twext.web2 import responsecode
from twext.web2.http import StatusResponse
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import MultiStatusResponse, statusForFailure,\
ErrorResponse
from twext.web2.dav.util import normalizeURL, davXMLFromStream
Modified: CalendarServer/trunk/twext/web2/dav/method/proppatch.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/proppatch.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/proppatch.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -35,7 +35,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
from twext.web2.dav.util import davXMLFromStream
Modified: CalendarServer/trunk/twext/web2/dav/method/put.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/put.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/put.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -34,7 +34,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.method import put_common
from twext.web2.dav.util import parentForURL
Modified: CalendarServer/trunk/twext/web2/dav/method/put_common.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/put_common.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/put_common.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -28,7 +28,7 @@
from twisted.python import failure, log
from twext.python.filepath import CachingFilePath as FilePath
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.base import dav_namespace
from twext.web2.dav.fileop import copy, delete, put
from twext.web2.dav.http import ErrorResponse
Modified: CalendarServer/trunk/twext/web2/dav/method/report.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/report.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/report.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -42,7 +42,7 @@
from twext.web2.http import HTTPError, StatusResponse
from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.util import davXMLFromStream
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.element import lookupElement
log = Logger()
Modified: CalendarServer/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -34,7 +34,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.http import MultiStatusResponse
from twext.web2.dav.method import prop_common
Modified: CalendarServer/trunk/twext/web2/dav/method/report_principal_search_property_set.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/report_principal_search_property_set.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/method/report_principal_search_property_set.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -33,7 +33,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.http import HTTPError, Response, StatusResponse
from twext.web2.stream import MemoryStream
Modified: CalendarServer/trunk/twext/web2/dav/test/test_prop.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/test/test_prop.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/test/test_prop.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -30,7 +30,7 @@
from twext.web2.test.test_server import SimpleRequest
from twext.web2.dav.test.util import serialize
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.element import dav_namespace, lookupElement
import twext.web2.dav.test.util
Modified: CalendarServer/trunk/twext/web2/dav/test/test_quota.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/test/test_quota.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/test/test_quota.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -29,7 +29,7 @@
import twext.web2.dav.test.util
from twext.web2.test.test_server import SimpleRequest
from twext.web2.dav.test.util import Site
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
import os
class QuotaBase(twext.web2.dav.test.util.TestCase):
Modified: CalendarServer/trunk/twext/web2/dav/test/test_report.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/test/test_report.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/test/test_report.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -28,7 +28,7 @@
import twext.web2.dav.test.util
from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
class REPORT(twext.web2.dav.test.util.TestCase):
"""
Modified: CalendarServer/trunk/twext/web2/dav/test/test_resource.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/test/test_resource.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/test/test_resource.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -28,7 +28,7 @@
from twext.web2.http import HTTPError
from twext.web2.auth import basic
from twext.web2.server import Site
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.resource import DAVResource, AccessDeniedError, \
DAVPrincipalResource, DAVPrincipalCollectionResource, davPrivilegeSet
from twext.web2.dav.auth import TwistedPasswordProperty, DavRealm, TwistedPropertyChecker, IPrincipal, AuthenticationWrapper
Modified: CalendarServer/trunk/twext/web2/dav/test/test_static.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/test/test_static.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twext/web2/dav/test/test_static.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -23,7 +23,7 @@
##
from twext.web2.dav.test import util
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.stream import readStream
from twext.web2.test.test_server import SimpleRequest
Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -33,7 +33,7 @@
from twisted.internet.defer import succeed, inlineCallbacks, returnValue
from twext.web2 import responsecode
from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.base import dav_namespace
from twext.web2.dav.util import joinURL
from twext.web2.dav.noneprops import NonePropertyStore
Modified: CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -44,7 +44,7 @@
from twisted.internet import reactor
from twisted.internet.defer import inlineCallbacks, returnValue, deferredGenerator, succeed
from twext.python.filepath import CachingFilePath as FilePath
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.base import twisted_dav_namespace, dav_namespace, parse_date, twisted_private_namespace
from twext.web2.dav.resource import DAVPropertyMixIn
from twext.web2.dav.util import joinURL
Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -40,7 +40,7 @@
from twext.web2.auth.digest import DigestedCredentials
from twext.web2 import responsecode
from twext.web2.http import HTTPError
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.util import joinURL
from twext.web2.dav.noneprops import NonePropertyStore
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_calendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_calendar.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_calendar.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -15,7 +15,7 @@
##
from twisted.internet.defer import inlineCallbacks
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twistedcaldav import caldavxml
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -15,7 +15,7 @@
##
from twistedcaldav.directory.directory import DirectoryService
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.resource import AccessDeniedError
from twext.web2.test.test_server import SimpleRequest
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -18,7 +18,7 @@
from twisted.cred.credentials import UsernamePassword
from twisted.internet.defer import inlineCallbacks
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.fileop import rmdir
from twext.web2.dav.resource import AccessDeniedError
from twext.web2.http import HTTPError
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -15,7 +15,7 @@
##
from twisted.internet.defer import DeferredList, inlineCallbacks, succeed
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twistedcaldav.directory.directory import DirectoryService
from twistedcaldav.test.util import xmlFile, augmentsFile, proxiesFile
Modified: CalendarServer/trunk/twistedcaldav/directory/wiki.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/wiki.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/directory/wiki.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -24,7 +24,7 @@
]
from twisted.internet.defer import inlineCallbacks, returnValue
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twisted.web.xmlrpc import Proxy, Fault
from twext.web2.http import HTTPError, StatusResponse
from twext.web2.auth.wrapper import UnauthorizedResponse
Modified: CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -24,7 +24,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.extensions import SyncCollection
from twext.web2.dav.resource import TwistedACLInheritable
from twext.web2.http import HTTPError, StatusResponse
Modified: CalendarServer/trunk/twistedcaldav/dropbox.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/dropbox.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/dropbox.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -25,7 +25,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.resource import DAVResource, TwistedACLInheritable
from twext.web2.dav.util import joinURL
Modified: CalendarServer/trunk/twistedcaldav/freebusyurl.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/freebusyurl.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/freebusyurl.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -26,7 +26,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.util import joinURL
from twext.web2.http import HTTPError
Modified: CalendarServer/trunk/twistedcaldav/linkresource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/linkresource.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/linkresource.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -17,7 +17,7 @@
from twext.python.log import LoggingMixIn
from twext.web2 import responsecode, server, http
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.http import HTTPError, StatusResponse
from twext.web2.resource import WrapperResource
Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/mail.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -55,7 +55,7 @@
from twext.web2 import server, responsecode
from twext.web2.channel.http import HTTPFactory
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.noneprops import NonePropertyStore
from twext.web2.http import Response, HTTPError
from twext.web2.http_headers import MimeType
Modified: CalendarServer/trunk/twistedcaldav/method/copymove.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/copymove.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/copymove.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -25,7 +25,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.web2 import responsecode
from twext.web2.filter.location import addLocation
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
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/copymove_contact.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/copymove_contact.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/copymove_contact.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -25,7 +25,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.web2 import responsecode
from twext.web2.filter.location import addLocation
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
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.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/delete.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/delete.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -24,7 +24,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.util import parentForURL
from twext.web2.http import HTTPError
Modified: CalendarServer/trunk/twistedcaldav/method/get.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/get.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/get.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -22,7 +22,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.util import parentForURL
from twext.web2.http import HTTPError
Modified: CalendarServer/trunk/twistedcaldav/method/mkcalendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/mkcalendar.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/mkcalendar.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -24,7 +24,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.python.failure import Failure
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
from twext.web2.dav.util import davXMLFromStream
from twext.web2.dav.util import parentForURL
Modified: CalendarServer/trunk/twistedcaldav/method/mkcol.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/mkcol.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/mkcol.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -26,7 +26,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.http import Response
from twext.web2.dav.http import ErrorResponse, PropertyStatusResponseQueue
from twext.web2.dav.util import davXMLFromStream
Modified: CalendarServer/trunk/twistedcaldav/method/propfind.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/propfind.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/propfind.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -32,7 +32,7 @@
from twext.web2.http import HTTPError
from twext.web2 import responsecode
from twext.web2.http import StatusResponse
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import MultiStatusResponse, statusForFailure,\
ErrorResponse
from twext.web2.dav.util import normalizeURL, davXMLFromStream
Modified: CalendarServer/trunk/twistedcaldav/method/put_addressbook_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/put_addressbook_common.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/put_addressbook_common.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -29,7 +29,7 @@
from twisted.internet.defer import Deferred, inlineCallbacks
from twisted.internet.defer import returnValue
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.util import joinURL, parentForURL
from twext.web2.http import HTTPError
Modified: CalendarServer/trunk/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/put_common.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/put_common.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -32,7 +32,7 @@
from twext.web2.dav.util import joinURL, parentForURL
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.http import HTTPError
from twext.web2.http import StatusResponse
Modified: CalendarServer/trunk/twistedcaldav/method/report.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/report.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -32,7 +32,7 @@
from twext.web2 import responsecode
from twext.web2.http import HTTPError, StatusResponse
from twext.web2.dav.util import davXMLFromStream
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.element import lookupElement
from twext.python.log import Logger
Modified: CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -27,7 +27,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
from twext.web2.dav.util import joinURL
Modified: CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -26,7 +26,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue,\
maybeDeferred
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import MultiStatusResponse
from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
from twext.web2.dav.util import joinURL
Modified: CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_freebusy.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/report_freebusy.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -25,7 +25,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
from twext.web2.http import HTTPError, Response, StatusResponse
from twext.web2.http_headers import MimeType
Modified: CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -24,7 +24,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.base import dav_namespace
from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
from twext.web2.dav.resource import AccessDeniedError
Modified: CalendarServer/trunk/twistedcaldav/mkcolxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mkcolxml.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/mkcolxml.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -25,7 +25,7 @@
See RFC 5689.
"""
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.element import registerElement
##
Modified: CalendarServer/trunk/twistedcaldav/notifications.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/notifications.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/notifications.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -25,7 +25,7 @@
from twext.python.log import Logger, LoggingMixIn
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twisted.internet.defer import succeed, inlineCallbacks, returnValue,\
maybeDeferred
Modified: CalendarServer/trunk/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/schedule.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/schedule.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -27,7 +27,7 @@
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.extensions import SyncCollection
from txdav.xml.rfc2518 import HRef
from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
Modified: CalendarServer/trunk/twistedcaldav/scheduling/caldav.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/caldav.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/scheduling/caldav.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -27,7 +27,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.python.failure import Failure
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.resource import AccessDeniedError
from twext.web2.dav.util import joinURL
from twext.web2.http import HTTPError
Modified: CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -27,7 +27,7 @@
from twext.web2 import responsecode
from twext.web2.http import HTTPError, Response, StatusResponse
from twext.web2.http_headers import MimeType
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import errorForFailure, messageForFailure, statusForFailure
from twext.web2.dav.http import ErrorResponse
Modified: CalendarServer/trunk/twistedcaldav/simpleresource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/simpleresource.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/simpleresource.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -26,7 +26,7 @@
]
from twext.web2 import http
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.noneprops import NonePropertyStore
from twisted.internet.defer import succeed
Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -21,7 +21,7 @@
import os
import re
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.resource import TwistedACLInheritable
from twext.python.plistlib import PlistParser #@UnresolvedImport
Modified: CalendarServer/trunk/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/storebridge.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -17,7 +17,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.base import dav_namespace, WebDAVUnknownElement
from twext.web2.dav.http import ErrorResponse, ResponseQueue, MultiStatusResponse
from twext.web2.dav.noneprops import NonePropertyStore
Modified: CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -20,7 +20,7 @@
from twext.web2 import responsecode
from twext.web2.iweb import IResponse
from twext.web2.stream import MemoryStream
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.fileop import rmdir
from twext.web2.dav.util import davXMLFromStream
from twext.web2.test.test_server import SimpleRequest
Modified: CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -20,7 +20,7 @@
from twext.web2 import responsecode
from twext.web2.iweb import IResponse
from twext.web2.stream import MemoryStream
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.fileop import rmdir
from twext.web2.dav.util import davXMLFromStream
from twext.web2.test.test_server import SimpleRequest
Modified: CalendarServer/trunk/twistedcaldav/test/test_cache.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_cache.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_cache.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -20,7 +20,7 @@
from twisted.internet.defer import succeed, maybeDeferred
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.util import allDataFromStream
from twext.web2.stream import MemoryStream
from twext.web2.http_headers import Headers
Modified: CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -23,7 +23,7 @@
from twext.web2 import responsecode
from twext.web2.iweb import IResponse
from twext.web2.stream import MemoryStream
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.util import davXMLFromStream
from twext.web2.test.test_server import SimpleRequest
Modified: CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -21,7 +21,7 @@
from twext.web2 import responsecode
from twext.web2.iweb import IResponse
from twext.web2.stream import MemoryStream
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.fileop import rmdir
from twext.web2.test.test_server import SimpleRequest
Modified: CalendarServer/trunk/twistedcaldav/test/test_multiget.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_multiget.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_multiget.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -20,7 +20,7 @@
from twext.web2 import responsecode
from twext.web2.iweb import IResponse
from twext.web2.stream import MemoryStream
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.util import davXMLFromStream
from twext.web2.test.test_server import SimpleRequest
Modified: CalendarServer/trunk/twistedcaldav/test/test_props.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_props.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_props.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -20,7 +20,7 @@
from twext.web2 import responsecode, http_headers
from twext.web2.iweb import IResponse
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.util import davXMLFromStream
from twext.web2.test.test_server import SimpleRequest
from twistedcaldav import caldavxml
Modified: CalendarServer/trunk/twistedcaldav/test/test_schedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_schedule.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_schedule.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -15,7 +15,7 @@
##
from twext.web2 import responsecode, http_headers
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.util import davXMLFromStream
from twext.web2.http import HTTPError
from twext.web2.iweb import IResponse
Modified: CalendarServer/trunk/twistedcaldav/test/test_sharing.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_sharing.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_sharing.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -16,7 +16,7 @@
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.http_headers import MimeType
from twext.web2.iweb import IResource
from twext.web2.stream import MemoryStream
Modified: CalendarServer/trunk/twistedcaldav/test/test_wrapping.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_wrapping.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/test_wrapping.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -24,7 +24,7 @@
from twext.web2.http_headers import Headers
from twext.enterprise.ienterprise import AlreadyFinishedError
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twistedcaldav.config import config
from twisted.internet.defer import inlineCallbacks, returnValue
Modified: CalendarServer/trunk/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/util.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/test/util.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -30,7 +30,7 @@
from twext.python.memcacheclient import ClientFactory
from twext.python.filepath import CachingFilePath as FilePath
import twext.web2.dav.test.util
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.http import HTTPError, StatusResponse
from twistedcaldav import memcacher
Modified: CalendarServer/trunk/twistedcaldav/timezoneservice.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezoneservice.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/timezoneservice.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -25,7 +25,7 @@
from twext.web2.dav.http import ErrorResponse
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.method.propfind import http_PROPFIND
from twext.web2.dav.noneprops import NonePropertyStore
from twext.web2.http import HTTPError
Modified: CalendarServer/trunk/twistedcaldav/timezonestdservice.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezonestdservice.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/timezonestdservice.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -27,7 +27,7 @@
from twext.python.log import Logger
from twext.web2 import responsecode
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.method.propfind import http_PROPFIND
from twext.web2.dav.noneprops import NonePropertyStore
Modified: CalendarServer/trunk/twistedcaldav/timezonexml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezonexml.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/twistedcaldav/timezonexml.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -18,7 +18,7 @@
This module provides XML definitions for use with Timezone Standard Service.
"""
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.element import registerElement
Modified: CalendarServer/trunk/txdav/base/propertystore/base.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/base.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/txdav/base/propertystore/base.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -24,7 +24,7 @@
]
from twext.python.log import LoggingMixIn
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.resource import TwistedGETContentMD5,\
TwistedQuotaRootProperty
Modified: CalendarServer/trunk/txdav/base/propertystore/test/base.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/test/base.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/txdav/base/propertystore/test/base.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -30,7 +30,7 @@
from twisted.internet.defer import inlineCallbacks
from twisted.trial import unittest
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.idav import IPropertyStore
from txdav.base.propertystore.base import PropertyName
Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/file.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/txdav/caldav/datastore/file.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -37,7 +37,7 @@
from twisted.python.failure import Failure
from twext.python.vcomponent import VComponent
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from txdav.xml.rfc2518 import ResourceType, GETContentType
from twext.web2.dav.resource import TwistedGETContentMD5
from twext.web2.http_headers import generateContentType, MimeType
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -450,7 +450,7 @@
"""
yield self.createConflicted()
from txdav.base.propertystore.base import PropertyName
- from twext.web2.dav import davxml
+ from txdav.xml import element as davxml
class StubConflictingElement(davxml.WebDAVTextElement):
namespace = "http://example.com/ns/stub-conflict"
name = "conflict"
Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -19,7 +19,7 @@
"""
from twext.enterprise.dal.syntax import Select
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twisted.internet.defer import inlineCallbacks
from twisted.internet.task import Clock
Modified: CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py
===================================================================
--- CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py 2012-03-17 07:27:16 UTC (rev 8907)
+++ CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py 2012-03-18 06:48:27 UTC (rev 8908)
@@ -22,7 +22,7 @@
from twisted.trial import unittest
-from twext.web2.dav import davxml
+from txdav.xml import element as davxml
from twext.web2.dav.resource import davPrivilegeSet
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120317/b5b145da/attachment-0001.html>
More information about the calendarserver-changes
mailing list