<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12100] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12100">12100</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 18:44:35 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename twext.web2 -> txweb2 and move it back to CalendarServer repo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserveraccesslogpy">CalendarServer/trunk/calendarserver/accesslog.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverprovisionrootpy">CalendarServer/trunk/calendarserver/provision/root.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverprovisiontesttest_rootpy">CalendarServer/trunk/calendarserver/provision/test/test_root.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverpushapplepushpy">CalendarServer/trunk/calendarserver/push/applepush.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_caldavpy">CalendarServer/trunk/calendarserver/tap/test/test_caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsdkimtoolpy">CalendarServer/trunk/calendarserver/tools/dkimtool.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_purgepy">CalendarServer/trunk/calendarserver/tools/test/test_purge.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_purge_old_eventspy">CalendarServer/trunk/calendarserver/tools/test/test_purge_old_events.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminresourcepy">CalendarServer/trunk/calendarserver/webadmin/resource.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadmintesttest_resourcepy">CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebcalresourcepy">CalendarServer/trunk/calendarserver/webcal/resource.py</a></li>
<li><a href="#CalendarServertrunkcontribperformancesqlusagerequestsinvitepy">CalendarServer/trunk/contrib/performance/sqlusage/requests/invite.py</a></li>
<li><a href="#CalendarServertrunkcontribperformancesqlusagerequestsmultigetpy">CalendarServer/trunk/contrib/performance/sqlusage/requests/multiget.py</a></li>
<li><a href="#CalendarServertrunkcontribperformancesqlusagerequestsputpy">CalendarServer/trunk/contrib/performance/sqlusage/requests/put.py</a></li>
<li><a href="#CalendarServertrunkcontribperformancesqlusagerequestsquerypy">CalendarServer/trunk/contrib/performance/sqlusage/requests/query.py</a></li>
<li><a href="#CalendarServertrunkcontribperformancesqlusagerequestssyncpy">CalendarServer/trunk/contrib/performance/sqlusage/requests/sync.py</a></li>
<li><a href="#CalendarServertrunkcontribperformancesqlusagesqlusagepy">CalendarServer/trunk/contrib/performance/sqlusage/sqlusage.py</a></li>
<li><a href="#CalendarServertrunksupportbuildsh">CalendarServer/trunk/support/build.sh</a></li>
<li><a href="#CalendarServertrunktwistedcaldav__init__py">CalendarServer/trunk/twistedcaldav/__init__.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavauthkerbpy">CalendarServer/trunk/twistedcaldav/authkerb.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavbindpy">CalendarServer/trunk/twistedcaldav/bind.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavcachepy">CalendarServer/trunk/twistedcaldav/cache.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavclient__init__py">CalendarServer/trunk/twistedcaldav/client/__init__.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavclientpoolpy">CalendarServer/trunk/twistedcaldav/client/pool.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavclientreverseproxypy">CalendarServer/trunk/twistedcaldav/client/reverseproxy.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavclienttesttest_reverseproxypy">CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdatafiltersprivateeventspy">CalendarServer/trunk/twistedcaldav/datafilters/privateevents.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdatafilterstesttest_privateeventspy">CalendarServer/trunk/twistedcaldav/datafilters/test/test_privateevents.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryaddressbookpy">CalendarServer/trunk/twistedcaldav/directory/addressbook.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryappleopendirectorypy">CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorycalendarpy">CalendarServer/trunk/twistedcaldav/directory/calendar.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy">CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorycommonpy">CalendarServer/trunk/twistedcaldav/directory/common.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorydigestpy">CalendarServer/trunk/twistedcaldav/directory/digest.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorydirectorypy">CalendarServer/trunk/twistedcaldav/directory/directory.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryinternalpy">CalendarServer/trunk/twistedcaldav/directory/internal.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryldapdirectorypy">CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryopendirectorybackerpy">CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryprincipalpy">CalendarServer/trunk/twistedcaldav/directory/principal.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryresourcepy">CalendarServer/trunk/twistedcaldav/directory/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_digestpy">CalendarServer/trunk/twistedcaldav/directory/test/test_digest.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_guidchangepy">CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_opendirectorypy">CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_principalpy">CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_wikipy">CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytestutilpy">CalendarServer/trunk/twistedcaldav/directory/test/util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryutilpy">CalendarServer/trunk/twistedcaldav/directory/util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorywikipy">CalendarServer/trunk/twistedcaldav/directory/wiki.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryxmlfilepy">CalendarServer/trunk/twistedcaldav/directory/xmlfile.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorybackedaddressbookpy">CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdropboxpy">CalendarServer/trunk/twistedcaldav/dropbox.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavextensionspy">CalendarServer/trunk/twistedcaldav/extensions.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavfreebusyurlpy">CalendarServer/trunk/twistedcaldav/freebusyurl.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavicaldavpy">CalendarServer/trunk/twistedcaldav/icaldav.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavlinkresourcepy">CalendarServer/trunk/twistedcaldav/linkresource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmemcachepropspy">CalendarServer/trunk/twistedcaldav/memcacheprops.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodaclpy">CalendarServer/trunk/twistedcaldav/method/acl.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodgetpy">CalendarServer/trunk/twistedcaldav/method/get.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodmkcalendarpy">CalendarServer/trunk/twistedcaldav/method/mkcalendar.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodmkcolpy">CalendarServer/trunk/twistedcaldav/method/mkcol.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodpostpy">CalendarServer/trunk/twistedcaldav/method/post.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodpropfindpy">CalendarServer/trunk/twistedcaldav/method/propfind.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreportpy">CalendarServer/trunk/twistedcaldav/method/report.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_addressbook_querypy">CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_calendar_querypy">CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_commonpy">CalendarServer/trunk/twistedcaldav/method/report_common.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_freebusypy">CalendarServer/trunk/twistedcaldav/method/report_freebusy.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_multiget_commonpy">CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_sync_collectionpy">CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavnotificationspy">CalendarServer/trunk/twistedcaldav/notifications.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavscheduling_storecaldavresourcepy">CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavscheduling_storecaldavtesttest_resourcepy">CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavsharingpy">CalendarServer/trunk/twistedcaldav/sharing.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavsimpleresourcepy">CalendarServer/trunk/twistedcaldav/simpleresource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_accountingpy">CalendarServer/trunk/twistedcaldav/test/test_accounting.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_addressbookmultigetpy">CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_addressbookquerypy">CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_cachepy">CalendarServer/trunk/twistedcaldav/test/test_cache.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_calendarquerypy">CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_collectioncontentspy">CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_extensionspy">CalendarServer/trunk/twistedcaldav/test/test_extensions.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_freebusyquerypy">CalendarServer/trunk/twistedcaldav/test/test_freebusyquery.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_kerberospy">CalendarServer/trunk/twistedcaldav/test/test_kerberos.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_linkpy">CalendarServer/trunk/twistedcaldav/test/test_link.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_memcachepropspy">CalendarServer/trunk/twistedcaldav/test/test_memcacheprops.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_mkcalendarpy">CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_multigetpy">CalendarServer/trunk/twistedcaldav/test/test_multiget.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_optionspy">CalendarServer/trunk/twistedcaldav/test/test_options.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_propspy">CalendarServer/trunk/twistedcaldav/test/test_props.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_resourcepy">CalendarServer/trunk/twistedcaldav/test/test_resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_sharingpy">CalendarServer/trunk/twistedcaldav/test/test_sharing.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_utilpy">CalendarServer/trunk/twistedcaldav/test/test_util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_wrappingpy">CalendarServer/trunk/twistedcaldav/test/test_wrapping.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtestutilpy">CalendarServer/trunk/twistedcaldav/test/util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtimezoneservicepy">CalendarServer/trunk/twistedcaldav/timezoneservice.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtimezonestdservicepy">CalendarServer/trunk/twistedcaldav/timezonestdservice.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavupgradepy">CalendarServer/trunk/twistedcaldav/upgrade.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavvcardpy">CalendarServer/trunk/twistedcaldav/vcard.py</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastorefilepy">CalendarServer/trunk/txdav/base/datastore/file.py</a></li>
<li><a href="#CalendarServertrunktxdavbasepropertystorebasepy">CalendarServer/trunk/txdav/base/propertystore/base.py</a></li>
<li><a href="#CalendarServertrunktxdavbasepropertystorexattrpy">CalendarServer/trunk/txdav/base/propertystore/xattr.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastorefilepy">CalendarServer/trunk/txdav/caldav/datastore/file.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingcaldavdeliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingcaldavschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipdeliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/scheduler.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_deliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduledeliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduledkimpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduleresourcepy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduleschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_dkimpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_localserverspy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_localservers.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_resourcepy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_implicitpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_attachmentspy">CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_utilpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreutilpy">CalendarServer/trunk/txdav/caldav/datastore/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavicalendarstorepy">CalendarServer/trunk/txdav/caldav/icalendarstore.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavresourcepy">CalendarServer/trunk/txdav/caldav/resource.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastorefilepy">CalendarServer/trunk/txdav/carddav/datastore/file.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastoresqlpy">CalendarServer/trunk/txdav/carddav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastoretestcommonpy">CalendarServer/trunk/txdav/carddav/datastore/test/common.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastorefilepy">CalendarServer/trunk/txdav/common/datastore/file.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretestutilpy">CalendarServer/trunk/txdav/common/datastore/test/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_4_to_5py">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradetesttest_migratepy">CalendarServer/trunk/txdav/common/datastore/upgrade/test/test_migrate.py</a></li>
<li><a href="#CalendarServertrunktxdavidavpy">CalendarServer/trunk/txdav/idav.py</a></li>
<li><a href="#CalendarServertrunktxdavxmlbasepy">CalendarServer/trunk/txdav/xml/base.py</a></li>
<li><a href="#CalendarServertrunktxdavxmlrfc2518py">CalendarServer/trunk/txdav/xml/rfc2518.py</a></li>
<li><a href="#CalendarServertrunktxdavxmltesttest_xml_rfc3744py">CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py</a></li>
<li><a href="#CalendarServertrunktxweb2__init__py">CalendarServer/trunk/txweb2/__init__.py</a></li>
<li><a href="#CalendarServertrunktxweb2_versionpy">CalendarServer/trunk/txweb2/_version.py</a></li>
<li><a href="#CalendarServertrunktxweb2authbasicpy">CalendarServer/trunk/txweb2/auth/basic.py</a></li>
<li><a href="#CalendarServertrunktxweb2authdigestpy">CalendarServer/trunk/txweb2/auth/digest.py</a></li>
<li><a href="#CalendarServertrunktxweb2authinterfacespy">CalendarServer/trunk/txweb2/auth/interfaces.py</a></li>
<li><a href="#CalendarServertrunktxweb2authwrapperpy">CalendarServer/trunk/txweb2/auth/wrapper.py</a></li>
<li><a href="#CalendarServertrunktxweb2channel__init__py">CalendarServer/trunk/txweb2/channel/__init__.py</a></li>
<li><a href="#CalendarServertrunktxweb2channelhttppy">CalendarServer/trunk/txweb2/channel/http.py</a></li>
<li><a href="#CalendarServertrunktxweb2client__init__py">CalendarServer/trunk/txweb2/client/__init__.py</a></li>
<li><a href="#CalendarServertrunktxweb2clienthttppy">CalendarServer/trunk/txweb2/client/http.py</a></li>
<li><a href="#CalendarServertrunktxweb2clientinterfacespy">CalendarServer/trunk/txweb2/client/interfaces.py</a></li>
<li><a href="#CalendarServertrunktxweb2dav__init__py">CalendarServer/trunk/txweb2/dav/__init__.py</a></li>
<li><a href="#CalendarServertrunktxweb2davauthpy">CalendarServer/trunk/txweb2/dav/auth.py</a></li>
<li><a href="#CalendarServertrunktxweb2davfileoppy">CalendarServer/trunk/txweb2/dav/fileop.py</a></li>
<li><a href="#CalendarServertrunktxweb2davhttppy">CalendarServer/trunk/txweb2/dav/http.py</a></li>
<li><a href="#CalendarServertrunktxweb2davidavpy">CalendarServer/trunk/txweb2/dav/idav.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethod__init__py">CalendarServer/trunk/txweb2/dav/method/__init__.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodaclpy">CalendarServer/trunk/txweb2/dav/method/acl.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodcopymovepy">CalendarServer/trunk/txweb2/dav/method/copymove.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethoddeletepy">CalendarServer/trunk/txweb2/dav/method/delete.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethoddelete_commonpy">CalendarServer/trunk/txweb2/dav/method/delete_common.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodgetpy">CalendarServer/trunk/txweb2/dav/method/get.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodlockpy">CalendarServer/trunk/txweb2/dav/method/lock.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodmkcolpy">CalendarServer/trunk/txweb2/dav/method/mkcol.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodprop_commonpy">CalendarServer/trunk/txweb2/dav/method/prop_common.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodpropfindpy">CalendarServer/trunk/txweb2/dav/method/propfind.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodproppatchpy">CalendarServer/trunk/txweb2/dav/method/proppatch.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodputpy">CalendarServer/trunk/txweb2/dav/method/put.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodput_commonpy">CalendarServer/trunk/txweb2/dav/method/put_common.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodreportpy">CalendarServer/trunk/txweb2/dav/method/report.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodreport_acl_principal_prop_setpy">CalendarServer/trunk/txweb2/dav/method/report_acl_principal_prop_set.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodreport_expandpy">CalendarServer/trunk/txweb2/dav/method/report_expand.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodreport_principal_matchpy">CalendarServer/trunk/txweb2/dav/method/report_principal_match.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodreport_principal_property_searchpy">CalendarServer/trunk/txweb2/dav/method/report_principal_property_search.py</a></li>
<li><a href="#CalendarServertrunktxweb2davmethodreport_principal_search_property_setpy">CalendarServer/trunk/txweb2/dav/method/report_principal_search_property_set.py</a></li>
<li><a href="#CalendarServertrunktxweb2davnonepropspy">CalendarServer/trunk/txweb2/dav/noneprops.py</a></li>
<li><a href="#CalendarServertrunktxweb2davresourcepy">CalendarServer/trunk/txweb2/dav/resource.py</a></li>
<li><a href="#CalendarServertrunktxweb2davstaticpy">CalendarServer/trunk/txweb2/dav/static.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtest__init__py">CalendarServer/trunk/txweb2/dav/test/__init__.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_aclpy">CalendarServer/trunk/txweb2/dav/test/test_acl.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_authpy">CalendarServer/trunk/txweb2/dav/test/test_auth.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_copypy">CalendarServer/trunk/txweb2/dav/test/test_copy.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_deletepy">CalendarServer/trunk/txweb2/dav/test/test_delete.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_httppy">CalendarServer/trunk/txweb2/dav/test/test_http.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_lockpy">CalendarServer/trunk/txweb2/dav/test/test_lock.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_mkcolpy">CalendarServer/trunk/txweb2/dav/test/test_mkcol.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_movepy">CalendarServer/trunk/txweb2/dav/test/test_move.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_optionspy">CalendarServer/trunk/txweb2/dav/test/test_options.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_pipelinepy">CalendarServer/trunk/txweb2/dav/test/test_pipeline.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_proppy">CalendarServer/trunk/txweb2/dav/test/test_prop.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_putpy">CalendarServer/trunk/txweb2/dav/test/test_put.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_quotapy">CalendarServer/trunk/txweb2/dav/test/test_quota.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_reportpy">CalendarServer/trunk/txweb2/dav/test/test_report.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_report_expandpy">CalendarServer/trunk/txweb2/dav/test/test_report_expand.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_resourcepy">CalendarServer/trunk/txweb2/dav/test/test_resource.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_staticpy">CalendarServer/trunk/txweb2/dav/test/test_static.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_utilpy">CalendarServer/trunk/txweb2/dav/test/test_util.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_xattrpropspy">CalendarServer/trunk/txweb2/dav/test/test_xattrprops.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtestutilpy">CalendarServer/trunk/txweb2/dav/test/util.py</a></li>
<li><a href="#CalendarServertrunktxweb2davutilpy">CalendarServer/trunk/txweb2/dav/util.py</a></li>
<li><a href="#CalendarServertrunktxweb2davxattrpropspy">CalendarServer/trunk/txweb2/dav/xattrprops.py</a></li>
<li><a href="#CalendarServertrunktxweb2errorpy">CalendarServer/trunk/txweb2/error.py</a></li>
<li><a href="#CalendarServertrunktxweb2fileuploadpy">CalendarServer/trunk/txweb2/fileupload.py</a></li>
<li><a href="#CalendarServertrunktxweb2filter__init__py">CalendarServer/trunk/txweb2/filter/__init__.py</a></li>
<li><a href="#CalendarServertrunktxweb2filtergzippy">CalendarServer/trunk/txweb2/filter/gzip.py</a></li>
<li><a href="#CalendarServertrunktxweb2filterlocationpy">CalendarServer/trunk/txweb2/filter/location.py</a></li>
<li><a href="#CalendarServertrunktxweb2filterrangepy">CalendarServer/trunk/txweb2/filter/range.py</a></li>
<li><a href="#CalendarServertrunktxweb2httppy">CalendarServer/trunk/txweb2/http.py</a></li>
<li><a href="#CalendarServertrunktxweb2http_headerspy">CalendarServer/trunk/txweb2/http_headers.py</a></li>
<li><a href="#CalendarServertrunktxweb2iwebpy">CalendarServer/trunk/txweb2/iweb.py</a></li>
<li><a href="#CalendarServertrunktxweb2logpy">CalendarServer/trunk/txweb2/log.py</a></li>
<li><a href="#CalendarServertrunktxweb2metafdpy">CalendarServer/trunk/txweb2/metafd.py</a></li>
<li><a href="#CalendarServertrunktxweb2resourcepy">CalendarServer/trunk/txweb2/resource.py</a></li>
<li><a href="#CalendarServertrunktxweb2responsecodepy">CalendarServer/trunk/txweb2/responsecode.py</a></li>
<li><a href="#CalendarServertrunktxweb2serverpy">CalendarServer/trunk/txweb2/server.py</a></li>
<li><a href="#CalendarServertrunktxweb2staticpy">CalendarServer/trunk/txweb2/static.py</a></li>
<li><a href="#CalendarServertrunktxweb2streampy">CalendarServer/trunk/txweb2/stream.py</a></li>
<li><a href="#CalendarServertrunktxweb2test__init__py">CalendarServer/trunk/txweb2/test/__init__.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_clientpy">CalendarServer/trunk/txweb2/test/test_client.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_fileuploadpy">CalendarServer/trunk/txweb2/test/test_fileupload.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_httppy">CalendarServer/trunk/txweb2/test/test_http.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_http_headerspy">CalendarServer/trunk/txweb2/test/test_http_headers.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_httpauthpy">CalendarServer/trunk/txweb2/test/test_httpauth.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_logpy">CalendarServer/trunk/txweb2/test/test_log.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_metafdpy">CalendarServer/trunk/txweb2/test/test_metafd.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_resourcepy">CalendarServer/trunk/txweb2/test/test_resource.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_serverpy">CalendarServer/trunk/txweb2/test/test_server.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_staticpy">CalendarServer/trunk/txweb2/test/test_static.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_streampy">CalendarServer/trunk/txweb2/test/test_stream.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalendarServer/trunk/txweb2/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserveraccesslogpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/accesslog.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/accesslog.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/accesslog.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx"> getAdjustedClientName
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import iweb
-from twext.web2.log import BaseCommonAccessLoggingObserver
-from twext.web2.log import LogWrapperResource
</del><ins>+from txweb2 import iweb
+from txweb2.log import BaseCommonAccessLoggingObserver
+from txweb2.log import LogWrapperResource
</ins><span class="cx">
</span><span class="cx"> from twisted.internet import protocol, task
</span><span class="cx"> from twisted.protocols import amp
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverprovisionrootpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/provision/root.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/provision/root.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/provision/root.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -20,11 +20,11 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.auth.wrapper import UnauthorizedResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.auth.wrapper import UnauthorizedResponse
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.xattrprops import xattrPropertyStore
-from twext.web2.http import HTTPError, StatusResponse, RedirectResponse
</del><ins>+from txweb2.dav.xattrprops import xattrPropertyStore
+from txweb2.http import HTTPError, StatusResponse, RedirectResponse
</ins><span class="cx">
</span><span class="cx"> from twisted.cred.error import LoginFailed, UnauthorizedLogin
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> self.responseCache = DisabledCache()
</span><span class="cx">
</span><span class="cx"> if config.ResponseCompression:
</span><del>- from twext.web2.filter import gzip
</del><ins>+ from txweb2.filter import gzip
</ins><span class="cx"> self.contentFilters.append((gzip.gzipfilter, True))
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverprovisiontesttest_rootpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/provision/test/test_root.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/provision/test/test_root.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/provision/test/test_root.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -19,15 +19,15 @@
</span><span class="cx"> from twisted.cred.portal import Portal
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, maybeDeferred, returnValue
</span><span class="cx">
</span><del>-from twext.web2 import http_headers
-from twext.web2 import responsecode
-from twext.web2 import server
-from twext.web2.auth import basic
-from twext.web2.dav import auth
</del><ins>+from txweb2 import http_headers
+from txweb2 import responsecode
+from txweb2 import server
+from txweb2.auth import basic
+from txweb2.dav import auth
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.http import HTTPError
-from twext.web2.iweb import IResponse
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.http import HTTPError
+from txweb2.iweb import IResponse
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.test.util import TestCase
</span><span class="cx"> from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushapplepushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/applepush.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/applepush.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/push/applepush.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -18,12 +18,12 @@
</span><span class="cx"> from twext.internet.ssl import ChainingOpenSSLContextFactory
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.server import parsePOSTData
</del><ins>+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.server import parsePOSTData
</ins><span class="cx"> from twisted.application import service
</span><span class="cx"> from twisted.internet import protocol
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="lines">@@ -888,7 +888,7 @@
</span><span class="cx"> to add a subscription entry to the database.
</span><span class="cx">
</span><span class="cx"> @param request: The request to process
</span><del>- @type request: L{twext.web2.server.Request}
</del><ins>+ @type request: L{txweb2.server.Request}
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> token = request.args.get("token", ("",))[0].replace(" ", "").lower()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -52,15 +52,15 @@
</span><span class="cx"> from twisted.application.service import Service
</span><span class="cx"> from twisted.protocols.amp import AMP
</span><span class="cx">
</span><del>-from twext.web2.server import Site
</del><ins>+from txweb2.server import Site
</ins><span class="cx"> from twext.python.log import Logger, LogLevel, replaceTwistedLoggers
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span><span class="cx"> from twext.internet.ssl import ChainingOpenSSLContextFactory
</span><span class="cx"> from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer
</span><span class="cx"> from twext.internet.fswatch import DirectoryChangeListener, IDirectoryChangeListenee
</span><del>-from twext.web2.channel.http import LimitingHTTPFactory, SSLRedirectRequest, \
</del><ins>+from txweb2.channel.http import LimitingHTTPFactory, SSLRedirectRequest, \
</ins><span class="cx"> HTTPChannel
</span><del>-from twext.web2.metafd import ConnectionLimiter, ReportingHTTPService
</del><ins>+from txweb2.metafd import ConnectionLimiter, ReportingHTTPService
</ins><span class="cx"> from twext.enterprise.ienterprise import POSTGRES_DIALECT
</span><span class="cx"> from twext.enterprise.ienterprise import ORACLE_DIALECT
</span><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> from version import version as getVersion
</span><span class="cx"> version = "%s (%s*)" % getVersion()
</span><span class="cx">
</span><del>-from twext.web2.server import VERSION as TWISTED_VERSION
</del><ins>+from txweb2.server import VERSION as TWISTED_VERSION
</ins><span class="cx"> TWISTED_VERSION = "CalendarServer/%s %s" % (
</span><span class="cx"> version.replace(" ", ""), TWISTED_VERSION,
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaptesttest_caldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx"> from plistlib import writePlist #@UnresolvedImport
</span><del>-from twext.web2.dav import auth
-from twext.web2.log import LogWrapperResource
</del><ins>+from txweb2.dav import auth
+from txweb2.log import LogWrapperResource
</ins><span class="cx"> from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config, ConfigDict, ConfigurationError
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -34,11 +34,11 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.auth.basic import BasicCredentialFactory
-from twext.web2.dav import auth
-from twext.web2.http_headers import Headers
-from twext.web2.resource import Resource
-from twext.web2.static import File as FileResource
</del><ins>+from txweb2.auth.basic import BasicCredentialFactory
+from txweb2.dav import auth
+from txweb2.http_headers import Headers
+from txweb2.resource import Resource
+from txweb2.static import File as FileResource
</ins><span class="cx">
</span><span class="cx"> from twisted.application.service import Service
</span><span class="cx"> from twisted.cred.portal import Portal
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsdkimtoolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dkimtool.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dkimtool.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tools/dkimtool.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx"> from twisted.python.usage import Options
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger, LogLevel, StandardIOObserver
</span><del>-from twext.web2.client.http import ClientRequest
-from twext.web2.http_headers import Headers
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.client.http import ClientRequest
+from txweb2.http_headers import Headers
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from txdav.caldav.datastore.scheduling.ischedule.dkim import RSA256, DKIMRequest, \
</span><span class="cx"> PublicKeyLookup, DKIMVerifier, DKIMVerificationError
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_purgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_purge.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_purge.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tools/test/test_purge.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> from txdav.common.datastore.test.util import populateCalendarsFrom
</span><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_MODE_WRITE
</span><span class="cx">
</span><del>-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_purge_old_eventspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_purge_old_events.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_purge_old_events.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tools/test/test_purge_old_events.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> from pycalendar.timezone import Timezone
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.dal.syntax import Update, Delete
</span><del>-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -36,12 +36,12 @@
</span><span class="cx"> from twistedcaldav.extensions import DAVFile, ReadOnlyResourceMixIn
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><del>-from twext.web2.http import Response
</del><ins>+from txweb2.http import Response
</ins><span class="cx"> from twisted.python.modules import getModule
</span><del>-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2.http_headers import MimeType
</ins><span class="cx"> from zope.interface.declarations import implements
</span><del>-from twext.web2.stream import MemoryStream
-from twext.web2.http import HTTPError
</del><ins>+from txweb2.stream import MemoryStream
+from txweb2.http import HTTPError
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx">
</span><span class="cx"> from twisted.web.iweb import ITemplateLoader
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadmintesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> from txdav.xml.rfc3744 import GroupMemberSet
</span><span class="cx"> from txdav.xml.rfc2518 import DisplayName
</span><span class="cx">
</span><del>-from twext.web2.http import HTTPError
-from twext.web2.responsecode import CONFLICT
</del><ins>+from txweb2.http import HTTPError
+from txweb2.responsecode import CONFLICT
</ins><span class="cx"> from txdav.xml.rfc2518 import HRef
</span><span class="cx"> from twistedcaldav.directory.directory import DirectoryRecord
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebcalresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webcal/resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webcal/resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/webcal/resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -30,12 +30,12 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.resource import TwistedACLInheritable
</del><ins>+from txweb2.dav.resource import TwistedACLInheritable
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.extensions import DAVFile, ReadOnlyResourceMixIn
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformancesqlusagerequestsinvitepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/invite.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/sqlusage/requests/invite.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/invite.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> from caldavclientlibrary.protocol.url import URL
</span><span class="cx"> from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><del>-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.util import joinURL
</ins><span class="cx"> from caldavclientlibrary.protocol.webdav.definitions import davxml
</span><span class="cx">
</span><span class="cx"> ICAL = """BEGIN:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformancesqlusagerequestsmultigetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/multiget.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/sqlusage/requests/multiget.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/multiget.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> from caldavclientlibrary.protocol.http.data.string import ResponseDataString
</span><span class="cx"> from caldavclientlibrary.protocol.webdav.definitions import davxml, statuscodes
</span><span class="cx"> from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
</span><del>-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.util import joinURL
</ins><span class="cx">
</span><span class="cx"> class MultigetTest(HTTPTestBase):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformancesqlusagerequestsputpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/put.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/sqlusage/requests/put.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/put.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> from caldavclientlibrary.protocol.url import URL
</span><span class="cx"> from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><del>-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.util import joinURL
</ins><span class="cx">
</span><span class="cx"> ICAL = """BEGIN:VCALENDAR
</span><span class="cx"> CALSCALE:GREGORIAN
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformancesqlusagerequestsquerypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/query.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/sqlusage/requests/query.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/query.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> from caldavclientlibrary.protocol.url import URL
</span><span class="cx"> from caldavclientlibrary.protocol.webdav.definitions import davxml, statuscodes
</span><span class="cx"> from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
</span><del>-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.util import joinURL
</ins><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="cx"> from caldavclientlibrary.protocol.caldav.query import QueryVEVENTTimeRange
</span><span class="cx"> from caldavclientlibrary.protocol.http.data.string import ResponseDataString
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformancesqlusagerequestssyncpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/sync.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/sqlusage/requests/sync.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/sync.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> from caldavclientlibrary.protocol.url import URL
</span><span class="cx"> from caldavclientlibrary.protocol.webdav.definitions import davxml
</span><span class="cx"> from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
</span><del>-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.util import joinURL
</ins><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="cx">
</span><span class="cx"> ICAL = """BEGIN:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformancesqlusagesqlusagepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/sqlusage/sqlusage.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/sqlusage/sqlusage.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/sqlusage.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> from contrib.performance.sqlusage.requests.query import QueryTest
</span><span class="cx"> from contrib.performance.sqlusage.requests.sync import SyncTest
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><del>-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.util import joinURL
</ins><span class="cx"> import getopt
</span><span class="cx"> import itertools
</span><span class="cx"> import sys
</span></span></pre></div>
<a id="CalendarServertrunksupportbuildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/build.sh (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/build.sh 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/support/build.sh 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> "${n}" "twisted" "${p}" \
</span><span class="cx"> "${pypi}/T/${n}/${p}.tar.bz2";
</span><span class="cx">
</span><del>- local v="12078";
</del><ins>+ local v="12094";
</ins><span class="cx"> local n="twext";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="cx"> py_dependency -fe -r "${v}" \
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldav__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/__init__.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/__init__.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> # Load in suitable file extension/content-type map from OS X
</span><span class="cx"> #
</span><span class="cx">
</span><del>-from twext.web2.static import File, loadMimeTypes
</del><ins>+from txweb2.static import File, loadMimeTypes
</ins><span class="cx">
</span><span class="cx"> File.contentTypes = loadMimeTypes(("/etc/apache2/mime.types", "/etc/httpd/mime.types",))
</span><span class="cx">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> # DefaultHTTPHandler
</span><span class="cx"> #
</span><span class="cx">
</span><del>-from twext.web2.http_headers import DefaultHTTPHandler, last, singleHeader
</del><ins>+from txweb2.http_headers import DefaultHTTPHandler, last, singleHeader
</ins><span class="cx">
</span><span class="cx"> DefaultHTTPHandler.updateParsers({
</span><span class="cx"> "If-Schedule-Tag-Match": (last, str),
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavauthkerbpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/authkerb.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/authkerb.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/authkerb.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx">
</span><span class="cx"> from twisted.cred import checkers, credentials, error
</span><span class="cx"> from twisted.internet.defer import succeed
</span><del>-from twext.web2 import responsecode
-from twext.web2.auth.interfaces import ICredentialFactory
-from twext.web2.dav.auth import IPrincipalCredentials
</del><ins>+from txweb2 import responsecode
+from txweb2.auth.interfaces import ICredentialFactory
+from txweb2.dav.auth import IPrincipalCredentials
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavbindpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/bind.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/bind.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/bind.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -19,16 +19,16 @@
</span><span class="cx"> Have to have this in a separate module for now.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-from twext.web2.dav.util import bindMethods
</del><ins>+from txweb2.dav.util import bindMethods
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Attach methods
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> def doBind():
</span><del>- import twext.web2.dav.method
- from twext.web2.dav.resource import DAVResource
- bindMethods(twext.web2.dav.method, DAVResource)
</del><ins>+ import txweb2.dav.method
+ from txweb2.dav.resource import DAVResource
+ bindMethods(txweb2.dav.method, DAVResource)
</ins><span class="cx">
</span><span class="cx"> import twistedcaldav.method
</span><span class="cx"> from twistedcaldav.resource import CalDAVResource
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavcachepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/cache.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/cache.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/cache.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.dav.util import allDataFromStream
-from twext.web2.http import Response
-from twext.web2.iweb import IResource
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.dav.util import allDataFromStream
+from txweb2.http import Response
+from txweb2.iweb import IResource
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavclient__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/client/__init__.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/client/__init__.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/client/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.http_headers import DefaultHTTPHandler, tokenize, generateList, singleHeader
</del><ins>+from txweb2.http_headers import DefaultHTTPHandler, tokenize, generateList, singleHeader
</ins><span class="cx">
</span><span class="cx"> DefaultHTTPHandler.updateParsers({
</span><span class="cx"> "x-forwarded-for": (tokenize, list),
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavclientpoolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/client/pool.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/client/pool.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/client/pool.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -33,11 +33,11 @@
</span><span class="cx"> from twisted.internet.error import ConnectionLost, ConnectionDone, ConnectError
</span><span class="cx"> from twisted.internet.protocol import ClientFactory
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.client.http import HTTPClientProtocol
-from twext.web2.http import StatusResponse, HTTPError
-from twext.web2.dav.util import allDataFromStream
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.client.http import HTTPClientProtocol
+from txweb2.http import StatusResponse, HTTPError
+from txweb2.dav.util import allDataFromStream
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> class PooledHTTPClientFactory(ClientFactory):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavclientreverseproxypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/client/reverseproxy.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/client/reverseproxy.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/client/reverseproxy.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -20,10 +20,10 @@
</span><span class="cx">
</span><span class="cx"> from zope.interface.declarations import implements
</span><span class="cx">
</span><del>-from twext.web2 import iweb, responsecode
-from twext.web2.client.http import ClientRequest
-from twext.web2.http import StatusResponse, HTTPError
-from twext.web2.resource import LeafResource
</del><ins>+from txweb2 import iweb, responsecode
+from txweb2.client.http import ClientRequest
+from txweb2.http import StatusResponse, HTTPError
+from txweb2.resource import LeafResource
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavclienttesttest_reverseproxypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,9 +14,9 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.client.http import ClientRequest
-from twext.web2.http import HTTPError
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.client.http import ClientRequest
+from txweb2.http import HTTPError
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx"> from twistedcaldav.client.pool import _clientPools
</span><span class="cx"> from twistedcaldav.client.reverseproxy import ReverseProxyResource
</span><span class="cx"> from twistedcaldav.config import config
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdatafiltersprivateeventspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/datafilters/privateevents.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/datafilters/privateevents.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/datafilters/privateevents.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,8 +14,8 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx"> from twistedcaldav.caldavxml import Property, CalendarData, CalendarComponent, \
</span><span class="cx"> AllProperties, AllComponents
</span><span class="cx"> from twistedcaldav.datafilters.calendardata import CalendarDataFilter
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdatafilterstesttest_privateeventspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/datafilters/test/test_privateevents.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/datafilters/test/test_privateevents.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/datafilters/test/test_privateevents.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.http import HTTPError
</del><ins>+from txweb2.http import HTTPError
</ins><span class="cx"> import twistedcaldav.test.util
</span><span class="cx"> from twistedcaldav.datafilters.privateevents import PrivateEventFilter
</span><span class="cx"> from twistedcaldav.ical import Component
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryaddressbookpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/addressbook.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/addressbook.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/addressbook.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,10 +26,10 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import ETag, MimeType
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError
+from txweb2.http_headers import ETag, MimeType
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryappleopendirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="cx"> from twisted.cred.credentials import UsernamePassword
</span><del>-from twext.web2.auth.digest import DigestedCredentials
</del><ins>+from txweb2.auth.digest import DigestedCredentials
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.directory.cachingdirectory import CachingDirectoryService, \
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorycalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import ETag, MimeType
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError
+from txweb2.http_headers import ETag, MimeType
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -31,12 +31,12 @@
</span><span class="cx"> import time
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.base import dav_namespace
</span><del>-from twext.web2.dav.util import joinURL
-from twext.web2.dav.noneprops import NonePropertyStore
</del><ins>+from txweb2.dav.util import joinURL
+from txweb2.dav.noneprops import NonePropertyStore
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorycommonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/common.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/common.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/common.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twext.web2.http import HTTPError
-from twext.web2 import responsecode
-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.dav.util import joinURL
</ins><span class="cx"> from twistedcaldav.directory.util import transactionFromRequest, NotFoundResource
</span><span class="cx"> from twistedcaldav.directory.resource import DirectoryReverseProxyResource
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorydigestpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/digest.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/digest.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/digest.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -17,12 +17,12 @@
</span><span class="cx">
</span><span class="cx"> from twisted.cred import error
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twext.web2.auth.digest import DigestCredentialFactory
-from twext.web2.auth.digest import DigestedCredentials
-from twext.web2.http_headers import Token
-from twext.web2.http_headers import parseKeyValue
-from twext.web2.http_headers import split
-from twext.web2.http_headers import tokenize
</del><ins>+from txweb2.auth.digest import DigestCredentialFactory
+from txweb2.auth.digest import DigestedCredentials
+from txweb2.http_headers import Token
+from txweb2.http_headers import parseKeyValue
+from txweb2.http_headers import split
+from txweb2.http_headers import tokenize
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Overrides twext.web2.auth.digest to allow specifying a qop value as a configuration parameter.
</del><ins>+Overrides txweb2.auth.digest to allow specifying a qop value as a configuration parameter.
</ins><span class="cx"> Also adds an sqlite-based credentials cache that is multi-process safe.
</span><span class="cx">
</span><span class="cx"> """
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> class QopDigestCredentialFactory(DigestCredentialFactory):
</span><span class="cx"> """
</span><del>- See twext.web2.auth.digest.DigestCredentialFactory
</del><ins>+ See txweb2.auth.digest.DigestCredentialFactory
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, algorithm, qop, realm, namespace="DIGESTCREDENTIALS"):
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> @type response: C{str}
</span><span class="cx"> @param response: A string of comma seperated key=value pairs
</span><span class="cx">
</span><del>- @type request: L{twext.web2.server.Request}
</del><ins>+ @type request: L{txweb2.server.Request}
</ins><span class="cx"> @param request: the request being processed
</span><span class="cx">
</span><span class="cx"> @return: L{DigestedCredentials}
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> @param auth: the response parameters.
</span><span class="cx"> @type auth: C{dict}
</span><span class="cx"> @param request: the request being processed.
</span><del>- @type request: L{twext.web2.server.Request}
</del><ins>+ @type request: L{txweb2.server.Request}
</ins><span class="cx">
</span><span class="cx"> @return: C{True} if validated.
</span><span class="cx"> @raise LoginFailed: if validation fails.
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorydirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/directory.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete
</span><span class="cx"> from twext.enterprise.queue import WorkItem, PeerConnectionPool
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.dav.auth import IPrincipalCredentials
-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.auth import IPrincipalCredentials
+from txweb2.dav.util import joinURL
</ins><span class="cx">
</span><span class="cx"> from twisted.cred.checkers import ICredentialsChecker
</span><span class="cx"> from twisted.cred.error import UnauthorizedLogin
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryinternalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/internal.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/internal.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/internal.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> "InternalDirectoryService",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from twext.web2.dav.auth import IPrincipalCredentials
</del><ins>+from txweb2.dav.auth import IPrincipalCredentials
</ins><span class="cx">
</span><span class="cx"> from twisted.cred.error import UnauthorizedLogin
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryldapdirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="cx"> from twisted.internet.threads import deferToThread
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2 import responsecode
</del><ins>+from txweb2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
</ins><span class="cx">
</span><span class="cx"> class LdapDirectoryService(CachingDirectoryService):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryopendirectorybackerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.base import twisted_dav_namespace, dav_namespace, parse_date, twisted_private_namespace
</span><del>-from twext.web2.dav.resource import DAVPropertyMixIn
-from twext.web2.dav.util import joinURL
-from twext.web2.http_headers import MimeType, generateContentType, ETag
</del><ins>+from txweb2.dav.resource import DAVPropertyMixIn
+from txweb2.dav.util import joinURL
+from txweb2.http_headers import MimeType, generateContentType, ETag
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> from twistedcaldav import customxml, carddavxml
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryprincipalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -38,12 +38,12 @@
</span><span class="cx"> from twisted.web.template import XMLFile, Element, renderer, tags
</span><span class="cx"> from twistedcaldav.directory.util import NotFoundResource
</span><span class="cx">
</span><del>-from twext.web2.auth.digest import DigestedCredentials
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
</del><ins>+from txweb2.auth.digest import DigestedCredentials
+from txweb2 import responsecode
+from txweb2.http import HTTPError
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.util import joinURL
-from twext.web2.dav.noneprops import NonePropertyStore
</del><ins>+from txweb2.dav.util import joinURL
+from txweb2.dav.noneprops import NonePropertyStore
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> Implements a directory-backed principal hierarchy.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.util import joinURL
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.client.reverseproxy import ReverseProxyResource
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_digestpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_digest.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_digest.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_digest.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -21,16 +21,16 @@
</span><span class="cx"> from twisted.internet import address
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.python import failure
</span><del>-from twext.web2.auth import digest
-from twext.web2.auth.wrapper import UnauthorizedResponse
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.auth import digest
+from txweb2.auth.wrapper import UnauthorizedResponse
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.directory.digest import QopDigestCredentialFactory
</span><span class="cx"> from twistedcaldav.test.util import TestCase
</span><span class="cx"> from twistedcaldav.config import config
</span><del>-from twext.web2.auth.digest import DigestCredentialFactory
-from twext.web2.test.test_httpauth import makeDigestDeterministic
-from twext.web2.test.test_httpauth import FAKE_STATIC_NONCE
</del><ins>+from txweb2.auth.digest import DigestCredentialFactory
+from txweb2.test.test_httpauth import makeDigestDeterministic
+from txweb2.test.test_httpauth import FAKE_STATIC_NONCE
</ins><span class="cx">
</span><span class="cx"> class FakeDigestCredentialFactory(QopDigestCredentialFactory):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_guidchangepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> from twistedcaldav.directory.directory import DirectoryService
</span><span class="cx">
</span><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.dav.resource import AccessDeniedError
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.directory.test.util import maybeCommit
</span><span class="cx"> from twistedcaldav.test.util import TestCase, xmlFile
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_opendirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> else:
</span><span class="cx"> from calendarserver.platform.darwin.od import dsattributes
</span><span class="cx"> from collections import defaultdict
</span><del>- from twext.web2.auth.digest import DigestedCredentials
</del><ins>+ from txweb2.auth.digest import DigestedCredentials
</ins><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.python.runtime import platform
</span><span class="cx"> from twisted.trial.unittest import SkipTest
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_principalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -20,10 +20,10 @@
</span><span class="cx"> from twisted.cred.credentials import UsernamePassword
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.fileop import rmdir
-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.http import HTTPError
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.dav.fileop import rmdir
+from txweb2.dav.resource import AccessDeniedError
+from txweb2.http import HTTPError
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.cache import DisabledCacheNotifier
</span><span class="cx"> from twistedcaldav.caldavxml import caldav_namespace
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_wikipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx"> )
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><span class="cx"> from twisted.web.xmlrpc import Fault
</span><del>-from twext.web2.http import HTTPError
-from twext.web2 import responsecode
</del><ins>+from txweb2.http import HTTPError
+from txweb2 import responsecode
</ins><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twisted.web.error import Error as WebError
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/util.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/util.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx">
</span><span class="cx"> from twisted.trial.unittest import SkipTest
</span><span class="cx"> from twisted.cred.credentials import UsernamePassword
</span><del>-from twext.web2.auth.digest import DigestedCredentials, calcResponse, calcHA1
</del><ins>+from txweb2.auth.digest import DigestedCredentials, calcResponse, calcHA1
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.directory.directory import DirectoryService
</span><span class="cx"> from twistedcaldav.directory.directory import UnknownRecordTypeError
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/util.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/util.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.auth.wrapper import UnauthorizedResponse
-from twext.web2.dav.resource import DAVResource
-from twext.web2.http import StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.auth.wrapper import UnauthorizedResponse
+from txweb2.dav.resource import DAVResource
+from txweb2.http import StatusResponse
</ins><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from uuid import UUID, uuid5
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorywikipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/wiki.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/wiki.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/wiki.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx">
</span><span class="cx"> from twext.internet.gaiendpoint import MultiFailure
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.auth.wrapper import UnauthorizedResponse
-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.auth.wrapper import UnauthorizedResponse
+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.web.error import Error as WebError
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryxmlfilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/xmlfile.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/xmlfile.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlfile.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> import types
</span><span class="cx">
</span><span class="cx"> from twisted.cred.credentials import UsernamePassword
</span><del>-from twext.web2.auth.digest import DigestedCredentials
</del><ins>+from txweb2.auth.digest import DigestedCredentials
</ins><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twisted.internet.defer import succeed
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorybackedaddressbookpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,10 +23,10 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, maybeDeferred, returnValue
</span><span class="cx"> from twisted.python.reflect import namedClass
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdropboxpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/dropbox.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/dropbox.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/dropbox.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,11 +24,11 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.resource import DAVResource, TwistedACLInheritable
-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.resource import DAVResource, TwistedACLInheritable
+from txweb2.dav.util import joinURL
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavextensionspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/extensions.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/extensions.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/extensions.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -40,23 +40,23 @@
</span><span class="cx"> from twisted.web.template import Element, XMLFile, renderer, tags, flattenString
</span><span class="cx"> from twisted.python.modules import getModule
</span><span class="cx">
</span><del>-from twext.web2 import responsecode, server
-from twext.web2.http import HTTPError, Response, RedirectResponse
-from twext.web2.http import StatusResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import FileStream
-from twext.web2.static import MetaDataMixin, StaticRenderMixin
</del><ins>+from txweb2 import responsecode, server
+from txweb2.http import HTTPError, Response, RedirectResponse
+from txweb2.http import StatusResponse
+from txweb2.http_headers import MimeType
+from txweb2.stream import FileStream
+from txweb2.static import MetaDataMixin, StaticRenderMixin
</ins><span class="cx"> from txdav.xml import element
</span><span class="cx"> from txdav.xml.base import encodeXMLName
</span><span class="cx"> from txdav.xml.element import dav_namespace
</span><del>-from twext.web2.dav.http import MultiStatusResponse
-from twext.web2.dav.static import DAVFile as SuperDAVFile
-from twext.web2.dav.resource import DAVResource as SuperDAVResource
-from twext.web2.dav.resource import (
</del><ins>+from txweb2.dav.http import MultiStatusResponse
+from txweb2.dav.static import DAVFile as SuperDAVFile
+from txweb2.dav.resource import DAVResource as SuperDAVResource
+from txweb2.dav.resource import (
</ins><span class="cx"> DAVPrincipalResource as SuperDAVPrincipalResource
</span><span class="cx"> )
</span><span class="cx"> from twisted.internet.defer import gatherResults
</span><del>-from twext.web2.dav.method import prop_common
</del><ins>+from txweb2.dav.method import prop_common
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><span class="lines">@@ -541,7 +541,7 @@
</span><span class="cx"> SuperDAVResource,
</span><span class="cx"> DirectoryRenderingMixIn, StaticRenderMixin):
</span><span class="cx"> """
</span><del>- Extended L{twext.web2.dav.resource.DAVResource} implementation.
</del><ins>+ Extended L{txweb2.dav.resource.DAVResource} implementation.
</ins><span class="cx">
</span><span class="cx"> Note we add StaticRenderMixin as a base class because we need all the etag etc behavior
</span><span class="cx"> that is currently in static.py but is actually applicable to any type of resource.
</span><span class="lines">@@ -577,7 +577,7 @@
</span><span class="cx">
</span><span class="cx"> class DAVResourceWithChildrenMixin (object):
</span><span class="cx"> """
</span><del>- Bits needed from twext.web2.static
</del><ins>+ Bits needed from txweb2.static
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, principalCollections=None):
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx">
</span><span class="cx"> class DAVResourceWithoutChildrenMixin (object):
</span><span class="cx"> """
</span><del>- Bits needed from twext.web2.static
</del><ins>+ Bits needed from txweb2.static
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, principalCollections=None):
</span><span class="lines">@@ -670,7 +670,7 @@
</span><span class="cx"> SuperDAVPrincipalResource,
</span><span class="cx"> DirectoryRenderingMixIn):
</span><span class="cx"> """
</span><del>- Extended L{twext.web2.dav.static.DAVFile} implementation.
</del><ins>+ Extended L{txweb2.dav.static.DAVFile} implementation.
</ins><span class="cx"> """
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -761,7 +761,7 @@
</span><span class="cx">
</span><span class="cx"> class DAVFile (SuperDAVFile, DirectoryRenderingMixIn):
</span><span class="cx"> """
</span><del>- Extended L{twext.web2.dav.static.DAVFile} implementation.
</del><ins>+ Extended L{txweb2.dav.static.DAVFile} implementation.
</ins><span class="cx"> """
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavfreebusyurlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/freebusyurl.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/freebusyurl.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/freebusyurl.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -25,15 +25,15 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError
-from twext.web2.http import Response
-from twext.web2.http import StatusResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError
+from txweb2.http import Response
+from txweb2.http import StatusResponse
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> from twistedcaldav.caldavxml import TimeRange
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> import uuid
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.stream import IStream
-from twext.web2.dav.util import allDataFromStream
</del><ins>+from txweb2.stream import IStream
+from txweb2.dav.util import allDataFromStream
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.dateops import timeRangesOverlap, normalizeForIndex, differenceDateTime, \
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavicaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/icaldav.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/icaldav.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/icaldav.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> "ICalendarPrincipalResource",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from twext.web2.dav.idav import IDAVResource
</del><ins>+from txweb2.dav.idav import IDAVResource
</ins><span class="cx">
</span><span class="cx"> class ICalDAVResource(IDAVResource):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavlinkresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/linkresource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/linkresource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/linkresource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -16,10 +16,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode, server, http
</del><ins>+from txweb2 import responsecode, server, http
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.resource import WrapperResource
</del><ins>+from txweb2.http import HTTPError, StatusResponse
+from txweb2.resource import WrapperResource
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, maybeDeferred
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmemcachepropspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/memcacheprops.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/memcacheprops.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/memcacheprops.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from txdav.xml.base import encodeXMLName
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodaclpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/acl.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/acl.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/acl.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -22,9 +22,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodgetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/get.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/get.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/get.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -21,14 +21,14 @@
</span><span class="cx"> __all__ = ["http_GET"]
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.customxml import calendarserver_namespace
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodmkcalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/mkcalendar.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/mkcalendar.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/mkcalendar.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,15 +23,15 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.python.failure import Failure
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
+from txweb2.dav.util import davXMLFromStream
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.dav.http import ErrorResponse
</del><ins>+from txweb2.dav.http import ErrorResponse
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodmkcolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/mkcol.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/mkcol.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/mkcol.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -25,14 +25,14 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.http import Response
-from twext.web2.dav.http import ErrorResponse, PropertyStatusResponseQueue
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError
-from twext.web2.http import StatusResponse
</del><ins>+from txweb2.http import Response
+from txweb2.dav.http import ErrorResponse, PropertyStatusResponseQueue
+from txweb2.dav.util import davXMLFromStream
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError
+from txweb2.http import StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml, carddavxml, mkcolxml
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> doc = (yield davXMLFromStream(request.stream))
</span><span class="cx"> except ValueError, e:
</span><span class="cx"> log.error("Error while handling MKCOL: %s" % (e,))
</span><del>- # TODO: twext.web2.dav 'MKCOL' tests demand this particular response
</del><ins>+ # TODO: txweb2.dav 'MKCOL' tests demand this particular response
</ins><span class="cx"> # code, but should we really be looking at the XML content or the
</span><span class="cx"> # content-type header? It seems to me like this ought to be considered
</span><span class="cx"> # a BAD_REQUEST if it claims to be XML but isn't, but an
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodpostpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/post.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/post.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/post.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> __all__ = ["http_POST"]
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodpropfindpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/propfind.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/propfind.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/propfind.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_prop.PROP.test_PROPFIND -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_prop.PROP.test_PROPFIND -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -29,13 +29,13 @@
</span><span class="cx">
</span><span class="cx"> from twisted.python.failure import Failure
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twext.web2.http import HTTPError
-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse
</del><ins>+from txweb2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.http import StatusResponse
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import MultiStatusResponse, statusForFailure, \
</del><ins>+from txweb2.dav.http import MultiStatusResponse, statusForFailure, \
</ins><span class="cx"> ErrorResponse
</span><del>-from twext.web2.dav.util import normalizeURL, davXMLFromStream, parentForURL
</del><ins>+from txweb2.dav.util import normalizeURL, davXMLFromStream, parentForURL
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreportpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -29,15 +29,15 @@
</span><span class="cx"> import string
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav.util import davXMLFromStream
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.dav.util import davXMLFromStream
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.base import encodeXMLName
</span><span class="cx"> from txdav.xml.element import lookupElement
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.dav.http import ErrorResponse
</del><ins>+from txweb2.dav.http import ErrorResponse
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_addressbook_querypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, maybeDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import carddavxml
</span><span class="cx"> from twistedcaldav.config import config
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_calendar_querypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,12 +24,12 @@
</span><span class="cx"> maybeDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.http import MultiStatusResponse
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.http import MultiStatusResponse
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> from twistedcaldav.caldavxml import caldav_namespace, MaxInstances, \
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_common.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -38,15 +38,15 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, maybeDeferred
</span><span class="cx"> from twisted.python.failure import Failure
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx">
</span><span class="cx"> from txdav.xml import element
</span><del>-from twext.web2.dav.http import statusForFailure
-from twext.web2.dav.method.propfind import propertyName
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.method.report import max_number_of_matches
-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.http import HTTPError
</del><ins>+from txweb2.dav.http import statusForFailure
+from txweb2.dav.method.propfind import propertyName
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.method.report import max_number_of_matches
+from txweb2.dav.resource import AccessDeniedError
+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_freebusypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_freebusy.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_freebusy.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_freebusy.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.http import HTTPError, Response, StatusResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.http import HTTPError, Response, StatusResponse
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> from twistedcaldav.ical import Component
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_multiget_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> from urllib import unquote
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.base import dav_namespace
</span><del>-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.resource import AccessDeniedError
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_sync_collectionpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -25,13 +25,13 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from txdav.xml import element
</span><del>-from twext.web2.dav.http import ErrorResponse
-from twext.web2 import responsecode
-from twext.web2.dav.http import MultiStatusResponse, statusForFailure
-from twext.web2.dav.method.prop_common import responseForHref
-from twext.web2.dav.method.propfind import propertyName
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2.dav.http import ErrorResponse
+from txweb2 import responsecode
+from txweb2.dav.http import MultiStatusResponse, statusForFailure
+from txweb2.dav.method.prop_common import responseForHref
+from txweb2.dav.method.propfind import propertyName
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavnotificationspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/notifications.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/notifications.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/notifications.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue,\
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -46,17 +46,17 @@
</span><span class="cx"> from txdav.xml import element
</span><span class="cx"> from txdav.xml.element import dav_namespace
</span><span class="cx">
</span><del>-from twext.web2 import responsecode, http, http_headers
-from twext.web2.dav.auth import AuthenticationWrapper as SuperAuthenticationWrapper
-from twext.web2.dav.idav import IDAVPrincipalCollectionResource
-from twext.web2.dav.resource import AccessDeniedError, DAVPrincipalCollectionResource, \
</del><ins>+from txweb2 import responsecode, http, http_headers
+from txweb2.dav.auth import AuthenticationWrapper as SuperAuthenticationWrapper
+from txweb2.dav.idav import IDAVPrincipalCollectionResource
+from txweb2.dav.resource import AccessDeniedError, DAVPrincipalCollectionResource, \
</ins><span class="cx"> davPrivilegeSet
</span><del>-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.dav.util import joinURL, parentForURL, normalizeURL
-from twext.web2.http import HTTPError, RedirectResponse, StatusResponse, Response
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.http_headers import MimeType, ETag
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.dav.util import joinURL, parentForURL, normalizeURL
+from txweb2.http import HTTPError, RedirectResponse, StatusResponse, Response
+from txweb2.dav.http import ErrorResponse
+from txweb2.http_headers import MimeType, ETag
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml, customxml
</span><span class="cx"> from twistedcaldav import carddavxml
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> successfully rendered.
</span><span class="cx">
</span><span class="cx"> @param request: the request to generate a response for.
</span><del>- @type request: L{twext.web2.iweb.IRequest}
</del><ins>+ @type request: L{txweb2.iweb.IRequest}
</ins><span class="cx"> @param transaction: optional transaction to use instead of associated transaction
</span><span class="cx"> @type transaction: L{txdav.caldav.idav.ITransaction}
</span><span class="cx"> """
</span><span class="lines">@@ -1354,7 +1354,7 @@
</span><span class="cx"> if self.exists() and hasattr(self, "scheduleEtags"):
</span><span class="cx"> etags = self.scheduleEtags
</span><span class="cx"> if len(etags) > 1:
</span><del>- # This is almost verbatim from twext.web2.static.checkPreconditions
</del><ins>+ # This is almost verbatim from txweb2.static.checkPreconditions
</ins><span class="cx"> if request.method not in ("GET", "HEAD"):
</span><span class="cx">
</span><span class="cx"> # Always test against the current etag first just in case schedule-etags is out of sync
</span><span class="lines">@@ -1402,7 +1402,7 @@
</span><span class="cx"> @param request: the request used to look up parent resources to
</span><span class="cx"> validate.
</span><span class="cx">
</span><del>- @type request: L{twext.web2.iweb.IRequest}
</del><ins>+ @type request: L{txweb2.iweb.IRequest}
</ins><span class="cx">
</span><span class="cx"> @return: a deferred that fires when a calendar collection has been
</span><span class="cx"> created in this resource.
</span><span class="lines">@@ -1488,7 +1488,7 @@
</span><span class="cx"> @param request: the request used to look up parent resources to
</span><span class="cx"> validate.
</span><span class="cx">
</span><del>- @type request: L{twext.web2.iweb.IRequest}
</del><ins>+ @type request: L{txweb2.iweb.IRequest}
</ins><span class="cx">
</span><span class="cx"> @return: a deferred that fires when an addressbook collection has been
</span><span class="cx"> created in this resource.
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavscheduling_storecaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -33,11 +33,11 @@
</span><span class="cx"> # around that for now.
</span><span class="cx"> __import__("twistedcaldav.stdconfig") # FIXME
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.resource import davPrivilegeSet
-from twext.web2.dav.util import joinURL, normalizeURL
-from twext.web2.http import HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.resource import davPrivilegeSet
+from txweb2.dav.util import joinURL, normalizeURL
+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="cx"> from twisted.python.failure import Failure
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavscheduling_storecaldavtesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> from twistedcaldav.test.util import StoreTestCase, SimpleStoreRequest
</span><span class="cx">
</span><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.http import HTTPError
</del><ins>+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> class Properties (StoreTestCase):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavsharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/sharing.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/sharing.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/sharing.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -25,11 +25,11 @@
</span><span class="cx"> "SharedHomeMixin",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, Response, XMLResponse
-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.dav.util import allDataFromStream, joinURL
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, Response, XMLResponse
+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.dav.util import allDataFromStream, joinURL
</ins><span class="cx">
</span><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_MODE_OWN, \
</span><span class="cx"> _BIND_MODE_READ, _BIND_MODE_WRITE, _BIND_STATUS_INVITED, \
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> @return: the (asynchronous) HTTP result to respond to the direct-share
</span><span class="cx"> request.
</span><del>- @rtype: L{Deferred} firing L{twext.web2.http.Response}, failing with
</del><ins>+ @rtype: L{Deferred} firing L{txweb2.http.Response}, failing with
</ins><span class="cx"> L{HTTPError}
</span><span class="cx"> """
</span><span class="cx">
</span><span class="lines">@@ -299,13 +299,13 @@
</span><span class="cx"> underlying shared collection.
</span><span class="cx">
</span><span class="cx"> @param request: the request used to locate the owner resource.
</span><del>- @type request: L{twext.web2.iweb.IRequest}
</del><ins>+ @type request: L{txweb2.iweb.IRequest}
</ins><span class="cx">
</span><span class="cx"> @param args: The arguments for
</span><del>- L{twext.web2.dav.idav.IDAVResource.accessControlList}
</del><ins>+ L{txweb2.dav.idav.IDAVResource.accessControlList}
</ins><span class="cx">
</span><span class="cx"> @param kwargs: The keyword arguments for
</span><del>- L{twext.web2.dav.idav.IDAVResource.accessControlList}, plus
</del><ins>+ L{txweb2.dav.idav.IDAVResource.accessControlList}, plus
</ins><span class="cx"> keyword-only arguments.
</span><span class="cx">
</span><span class="cx"> @return: the appropriate WebDAV ACL for the sharee
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavsimpleresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/simpleresource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/simpleresource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/simpleresource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> "SimpleDataResource",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from twext.web2 import http
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.http import Response
</del><ins>+from txweb2 import http
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.http import Response
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> from plistlib import PlistParser #@UnresolvedImport
</span><span class="cx"> from twext.python.log import Logger, InvalidLogLevelError, LogLevel
</span><del>-from twext.web2.dav.resource import TwistedACLInheritable
</del><ins>+from txweb2.dav.resource import TwistedACLInheritable
</ins><span class="cx">
</span><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx">
</span><span class="lines">@@ -1011,7 +1011,7 @@
</span><span class="cx"> "FreeBusyIndexDelayedExpand": True,
</span><span class="cx">
</span><span class="cx"> # The RootResource uses a twext property store. Specify the class here
</span><del>- "RootResourcePropStoreClass": "twext.web2.dav.xattrprops.xattrPropertyStore",
</del><ins>+ "RootResourcePropStoreClass": "txweb2.dav.xattrprops.xattrPropertyStore",
</ins><span class="cx">
</span><span class="cx"> # Used in the command line utilities to specify which service class to
</span><span class="cx"> # use to carry out work.
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -19,20 +19,20 @@
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.locking import LockTimeout
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode, http_headers, http
-from twext.web2.dav.http import ErrorResponse, ResponseQueue, MultiStatusResponse
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.dav.resource import TwistedACLInheritable, AccessDeniedError, \
</del><ins>+from txweb2 import responsecode, http_headers, http
+from txweb2.dav.http import ErrorResponse, ResponseQueue, MultiStatusResponse
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.dav.resource import TwistedACLInheritable, AccessDeniedError, \
</ins><span class="cx"> davPrivilegeSet
</span><del>-from twext.web2.dav.util import parentForURL, allDataFromStream, joinURL, davXMLFromStream
-from twext.web2.filter.location import addLocation
-from twext.web2.http import HTTPError, StatusResponse, Response
-from twext.web2.http_headers import ETag, MimeType, MimeDisposition
-from twext.web2.iweb import IResponse
-from twext.web2.responsecode import \
</del><ins>+from txweb2.dav.util import parentForURL, allDataFromStream, joinURL, davXMLFromStream
+from txweb2.filter.location import addLocation
+from txweb2.http import HTTPError, StatusResponse, Response
+from txweb2.http_headers import ETag, MimeType, MimeDisposition
+from txweb2.iweb import IResponse
+from txweb2.responsecode import \
</ins><span class="cx"> FORBIDDEN, NO_CONTENT, NOT_FOUND, CREATED, CONFLICT, PRECONDITION_FAILED, \
</span><span class="cx"> BAD_REQUEST, OK, INSUFFICIENT_STORAGE_SPACE, SERVICE_UNAVAILABLE
</span><del>-from twext.web2.stream import ProducerStream, readStream, MemoryStream
</del><ins>+from txweb2.stream import ProducerStream, readStream, MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue, maybeDeferred
</span><span class="cx"> from twisted.internet.protocol import Protocol
</span><span class="lines">@@ -450,12 +450,12 @@
</span><span class="cx"> this is the request which I{triggered} the C{DELETE}, but which may
</span><span class="cx"> not actually be a C{DELETE} request itself.
</span><span class="cx">
</span><del>- @type request: L{twext.web2.iweb.IRequest}
</del><ins>+ @type request: L{txweb2.iweb.IRequest}
</ins><span class="cx">
</span><span class="cx"> @return: an HTTP response suitable for sending to a client (or
</span><span class="cx"> including in a multi-status).
</span><span class="cx">
</span><del>- @rtype: something adaptable to L{twext.web2.iweb.IResponse}
</del><ins>+ @rtype: something adaptable to L{txweb2.iweb.IResponse}
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # Check sharee collection first
</span><span class="lines">@@ -2487,7 +2487,7 @@
</span><span class="cx"> Move this object to a different parent.
</span><span class="cx">
</span><span class="cx"> @param request:
</span><del>- @type request: L{twext.web2.iweb.IRequest}
</del><ins>+ @type request: L{txweb2.iweb.IRequest}
</ins><span class="cx"> @param destinationparent: Parent to move to
</span><span class="cx"> @type destinationparent: L{CommonHomeChild}
</span><span class="cx"> @param destination_name: name of new resource
</span><span class="lines">@@ -2506,12 +2506,12 @@
</span><span class="cx"> @param request: Unused by this implementation; present for signature
</span><span class="cx"> compatibility with L{CalendarCollectionResource.storeRemove}.
</span><span class="cx">
</span><del>- @type request: L{twext.web2.iweb.IRequest}
</del><ins>+ @type request: L{txweb2.iweb.IRequest}
</ins><span class="cx">
</span><span class="cx"> @return: an HTTP response suitable for sending to a client (or
</span><span class="cx"> including in a multi-status).
</span><span class="cx">
</span><del>- @rtype: something adaptable to L{twext.web2.iweb.IResponse}
</del><ins>+ @rtype: something adaptable to L{txweb2.iweb.IResponse}
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # Do delete
</span><span class="lines">@@ -2722,7 +2722,7 @@
</span><span class="cx"> if self.exists():
</span><span class="cx"> etags = self.scheduleEtags
</span><span class="cx"> if len(etags) > 1:
</span><del>- # This is almost verbatim from twext.web2.static.checkPreconditions
</del><ins>+ # This is almost verbatim from txweb2.static.checkPreconditions
</ins><span class="cx"> if request.method not in ("GET", "HEAD"):
</span><span class="cx">
</span><span class="cx"> # Always test against the current etag first just in case schedule-etags is out of sync
</span><span class="lines">@@ -3514,13 +3514,13 @@
</span><span class="cx"> "direct" shares are not supported.
</span><span class="cx">
</span><span class="cx"> @param request: the request used to locate the owner resource.
</span><del>- @type request: L{twext.web2.iweb.IRequest}
</del><ins>+ @type request: L{txweb2.iweb.IRequest}
</ins><span class="cx">
</span><span class="cx"> @param args: The arguments for
</span><del>- L{twext.web2.dav.idav.IDAVResource.accessControlList}
</del><ins>+ L{txweb2.dav.idav.IDAVResource.accessControlList}
</ins><span class="cx">
</span><span class="cx"> @param kwargs: The keyword arguments for
</span><del>- L{twext.web2.dav.idav.IDAVResource.accessControlList}, plus
</del><ins>+ L{txweb2.dav.idav.IDAVResource.accessControlList}, plus
</ins><span class="cx"> keyword-only arguments.
</span><span class="cx">
</span><span class="cx"> @return: the appropriate WebDAV ACL for the sharee
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_accountingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_accounting.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_accounting.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_accounting.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,9 +14,9 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.channel.http import HTTPLoggingChannelRequest
-from twext.web2 import http_headers
-from twext.web2.channel.http import HTTPChannel
</del><ins>+from txweb2.channel.http import HTTPLoggingChannelRequest
+from txweb2 import http_headers
+from txweb2.channel.http import HTTPChannel
</ins><span class="cx"> from twistedcaldav.accounting import emitAccounting
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> import twistedcaldav.test.util
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_addressbookmultigetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -16,11 +16,11 @@
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
-from twext.web2.dav.util import davXMLFromStream, joinURL
-from twext.web2.http_headers import Headers, MimeType
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
+from txweb2.dav.util import davXMLFromStream, joinURL
+from txweb2.http_headers import Headers, MimeType
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import carddavxml
</span><span class="cx"> from twistedcaldav import vcard
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_addressbookquerypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -16,11 +16,11 @@
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.util import davXMLFromStream, joinURL
</del><ins>+from txweb2.dav.util import davXMLFromStream, joinURL
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import carddavxml, vcard
</span><span class="cx"> from twistedcaldav.config import config
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_cachepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_cache.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_cache.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_cache.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, maybeDeferred, inlineCallbacks
</span><span class="cx">
</span><del>-from twext.web2.dav.util import allDataFromStream
-from twext.web2.stream import MemoryStream
-from twext.web2.http_headers import Headers
</del><ins>+from txweb2.dav.util import allDataFromStream
+from txweb2.stream import MemoryStream
+from txweb2.http_headers import Headers
</ins><span class="cx">
</span><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_calendarquerypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -18,11 +18,11 @@
</span><span class="cx">
</span><span class="cx"> from twisted.trial.unittest import SkipTest
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.util import davXMLFromStream
</del><ins>+from txweb2.dav.util import davXMLFromStream
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> from twistedcaldav import ical
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_collectioncontentspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -16,10 +16,10 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream, FileStream
-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream, FileStream
+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.ical import Component
</span><span class="cx"> from twistedcaldav.memcachelock import MemcacheLock
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.test.util import StoreTestCase, SimpleStoreRequest
</span><del>-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.util import joinURL
</ins><span class="cx"> from txdav.caldav.datastore.sql import CalendarObject
</span><span class="cx">
</span><span class="cx"> class CollectionContents(StoreTestCase):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_extensionspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_extensions.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_extensions.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_extensions.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><del>-from twext.web2.http_headers import MimeType
-from twext.web2.static import MetaDataMixin
</del><ins>+from txweb2.http_headers import MimeType
+from txweb2.static import MetaDataMixin
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, Deferred, succeed
</span><span class="cx"> from twisted.web.microdom import parseString
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_freebusyquerypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_freebusyquery.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_freebusyquery.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_freebusyquery.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -21,11 +21,11 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><del>-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> import twistedcaldav.test.util
</span><span class="cx"> from twistedcaldav import caldavxml
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_kerberospy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_kerberos.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_kerberos.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_kerberos.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> from twisted.cred.error import LoginFailed
</span><span class="cx"> from twisted.cred.error import UnauthorizedLogin
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><del>-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import authkerb
</span><span class="cx"> import twistedcaldav.test.util
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_linkpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_link.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_link.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_link.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,9 +14,9 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_memcachepropspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_memcacheprops.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_memcacheprops.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_memcacheprops.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-from twext.web2.http import HTTPError
</del><ins>+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> from txdav.xml.base import encodeXMLName
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_mkcalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -18,11 +18,11 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.fileop import rmdir
</del><ins>+from txweb2.dav.fileop import rmdir
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> from twistedcaldav.test.util import StoreTestCase, SimpleStoreRequest
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_multigetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_multiget.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_multiget.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_multiget.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,11 +14,11 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.util import davXMLFromStream, joinURL
-from twext.web2.http_headers import Headers, MimeType
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.util import davXMLFromStream, joinURL
+from txweb2.http_headers import Headers, MimeType
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_optionspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_options.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_options.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_options.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,8 +14,8 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.iweb import IResponse
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.iweb import IResponse
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> import twistedcaldav.test.util
</span><span class="cx"> from twistedcaldav.config import config
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_propspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_props.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_props.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_props.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,10 +14,10 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2 import responsecode, http_headers
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode, http_headers
+from txweb2.dav.util import davXMLFromStream
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> from twistedcaldav.test.util import StoreTestCase, SimpleStoreRequest
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -15,8 +15,8 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from txdav.xml.element import HRef, Principal, Unauthenticated
</span><del>-from twext.web2.http import HTTPError
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.http import HTTPError
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_sharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_sharing.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_sharing.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_sharing.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,10 +14,10 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.util import allDataFromStream
-from twext.web2.http_headers import MimeType
-from twext.web2.iweb import IResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.util import allDataFromStream
+from txweb2.http_headers import MimeType
+from txweb2.iweb import IResponse
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_util.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_util.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.http_headers import Headers
</del><ins>+from txweb2.http_headers import Headers
</ins><span class="cx">
</span><span class="cx"> import twistedcaldav.test.util
</span><span class="cx"> from twistedcaldav.util import bestAcceptType
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_wrappingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_wrapping.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_wrapping.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_wrapping.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -21,12 +21,12 @@
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span><span class="cx"> from twext.enterprise.locking import NamedLock
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import Headers, MimeType
-from twext.web2.responsecode import INSUFFICIENT_STORAGE_SPACE
-from twext.web2.responsecode import UNAUTHORIZED
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.http_headers import Headers, MimeType
+from txweb2.responsecode import INSUFFICIENT_STORAGE_SPACE
+from txweb2.responsecode import UNAUTHORIZED
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.internet.defer import maybeDeferred
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/util.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/util.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> from twisted.internet.protocol import ProcessProtocol
</span><span class="cx">
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><del>-import twext.web2.dav.test.util
</del><ins>+import txweb2.dav.test.util
</ins><span class="cx"> from txdav.xml import element as davxml, element
</span><del>-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import memcacher
</span><span class="cx"> from twistedcaldav.memcacheclient import ClientFactory
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from txdav.caldav.datastore.test.util import buildCalendarStore
</span><span class="cx"> from calendarserver.tap.util import getRootResource, directoryFromConfig
</span><del>-from twext.web2.dav.test.util import SimpleRequest
</del><ins>+from txweb2.dav.test.util import SimpleRequest
</ins><span class="cx"> from twistedcaldav.directory.util import transactionFromRequest
</span><span class="cx"> from twistedcaldav.directory.directory import DirectoryService
</span><span class="cx">
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class StoreTestCase(CommonCommonTests, twext.web2.dav.test.util.TestCase):
</del><ins>+class StoreTestCase(CommonCommonTests, txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> A base class for tests that use the SQL store.
</span><span class="cx"> """
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class TestCase(twext.web2.dav.test.util.TestCase):
</del><ins>+class TestCase(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> resource_class = RootResource
</span><span class="cx">
</span><span class="cx"> def createDataStore(self):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtimezoneservicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/timezoneservice.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/timezoneservice.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/timezoneservice.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -22,17 +22,17 @@
</span><span class="cx"> "TimezoneServiceResource",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from twext.web2.dav.http import ErrorResponse
</del><ins>+from txweb2.dav.http import ErrorResponse
</ins><span class="cx">
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.method.propfind import http_PROPFIND
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.http import HTTPError
-from twext.web2.http import Response
-from twext.web2.http import XMLResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.dav.method.propfind import http_PROPFIND
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.http import HTTPError
+from txweb2.http import Response
+from txweb2.http import XMLResponse
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtimezonestdservicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/timezonestdservice.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/timezonestdservice.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/timezonestdservice.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.method.propfind import http_PROPFIND
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.http import HTTPError, JSONResponse
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.method.propfind import http_PROPFIND
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.http import HTTPError, JSONResponse
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue, \
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/upgrade.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/upgrade.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from txdav.xml import element
</span><del>-from twext.web2.dav.fileop import rmdir
</del><ins>+from txweb2.dav.fileop import rmdir
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> from twistedcaldav.directory import calendaruserproxy
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavvcardpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/vcard.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/vcard.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/vcard.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> import codecs
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.stream import IStream
-from twext.web2.dav.util import allDataFromStream
</del><ins>+from txweb2.stream import IStream
+from txweb2.dav.util import allDataFromStream
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/file.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/file.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/base/datastore/file.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span><del>-from twext.web2.dav.resource import TwistedGETContentMD5
</del><ins>+from txweb2.dav.resource import TwistedGETContentMD5
</ins><span class="cx"> from txdav.idav import IDataStoreObject
</span><span class="cx"> from txdav.base.propertystore.base import PropertyName
</span><span class="cx"> from txdav.xml.element import GETContentType
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasepropertystorebasepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/propertystore/base.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/propertystore/base.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/base/propertystore/base.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.base import encodeXMLName
</span><del>-from twext.web2.dav.resource import TwistedGETContentMD5, \
</del><ins>+from txweb2.dav.resource import TwistedGETContentMD5, \
</ins><span class="cx"> TwistedQuotaRootProperty
</span><span class="cx">
</span><span class="cx"> from txdav.idav import IPropertyStore, IPropertyName
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasepropertystorexattrpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/propertystore/xattr.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/propertystore/xattr.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/base/propertystore/xattr.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> # Mimic old xattr-prefix behavior by importing it directly.
</span><span class="cx"> deadPropertyXattrPrefix = namedAny(
</span><del>- "twext.web2.dav.xattrprops.xattrPropertyStore.deadPropertyXattrPrefix"
</del><ins>+ "txweb2.dav.xattrprops.xattrPropertyStore.deadPropertyXattrPrefix"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # There is a 127 character limit for xattr keys so we need to
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/file.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/file.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> from twistedcaldav.ical import Component as VComponent
</span><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.rfc2518 import GETContentType
</span><del>-from twext.web2.dav.resource import TwistedGETContentMD5
-from twext.web2.http_headers import generateContentType, MimeType
</del><ins>+from txweb2.dav.resource import TwistedGETContentMD5
+from txweb2.http_headers import generateContentType, MimeType
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml, customxml, ical
</span><span class="cx"> from twistedcaldav.caldavxml import ScheduleCalendarTransp, Opaque, Transparent
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingcaldavdeliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -15,12 +15,12 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger, LogLevel
</span><del>-from twext.web2.dav.http import ErrorResponse
</del><ins>+from txweb2.dav.http import ErrorResponse
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="cx"> from twisted.python.failure import Failure
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.caldavxml import caldav_namespace
</span><span class="cx"> from twistedcaldav.config import config
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingcaldavschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -15,9 +15,9 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipdeliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.queue import inTransaction
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.http import HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse
+from txweb2.http import HTTPError
</ins><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.python.failure import Failure
</span><span class="cx"> from twistedcaldav.caldavxml import caldav_namespace
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/scheduler.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/scheduler.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/scheduler.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.dav.http import ErrorResponse
</del><ins>+from txweb2.dav.http import ErrorResponse
</ins><span class="cx"> from twisted.internet.defer import succeed
</span><span class="cx"> from twistedcaldav.caldavxml import caldav_namespace
</span><span class="cx"> from txdav.caldav.datastore.scheduling.cuaddress import RemoteCalendarUser
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_deliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.trial import unittest
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -15,11 +15,11 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.dav.http import ErrorResponse
</del><ins>+from txweb2.dav.http import ErrorResponse
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.caldavxml import caldav_namespace
</span><span class="cx"> from twistedcaldav.config import config
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduledeliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -20,15 +20,15 @@
</span><span class="cx">
</span><span class="cx"> from twext.internet.gaiendpoint import GAIEndpoint
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.client.http import ClientRequest
-from twext.web2.client.http import HTTPClientProtocol
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import davXMLFromStream, joinURL, allDataFromStream
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import Headers
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.client.http import ClientRequest
+from txweb2.client.http import HTTPClientProtocol
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import davXMLFromStream, joinURL, allDataFromStream
+from txweb2.http import HTTPError
+from txweb2.http_headers import Headers
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, DeferredList, returnValue
</span><span class="cx"> from twisted.internet.protocol import Factory
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduledkimpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -15,11 +15,11 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.client.http import ClientRequest
-from twext.web2.dav.util import allDataFromStream, joinURL
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.client.http import ClientRequest
+from txweb2.dav.util import allDataFromStream, joinURL
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="cx"> from twistedcaldav.client.geturl import getURL
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> def __init__(self, headers, body, key_lookup=None, protocol_debug=False):
</span><span class="cx"> """
</span><span class="cx"> @param headers: The HTTP request headers to process
</span><del>- @type headers: L{twext.web2.http_headers.Headers}
</del><ins>+ @type headers: L{txweb2.http_headers.Headers}
</ins><span class="cx"> @param body: The HTTP request body to process
</span><span class="cx"> @type body: C{str}
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduleresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -17,12 +17,12 @@
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="cx"> from pycalendar.timezone import Timezone
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.dav.util import allDataFromStream
-from twext.web2.http import Response, HTTPError, StatusResponse, XMLResponse
-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.dav.util import allDataFromStream
+from txweb2.http import Response, HTTPError, StatusResponse, XMLResponse
+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, returnValue, inlineCallbacks
</span><span class="cx"> from twisted.python.failure import Failure
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduleschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -15,9 +15,9 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, Response
-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, Response
+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.abstract import isIPAddress
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_dkimpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx">
</span><span class="cx"> from Crypto.PublicKey import RSA
</span><span class="cx">
</span><del>-from twext.web2.dav.util import allDataFromStream
-from twext.web2.http_headers import Headers, MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.dav.util import allDataFromStream
+from txweb2.http_headers import Headers, MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><span class="cx"> from twisted.names import client
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_localserverspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_localservers.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_localservers.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_localservers.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -14,8 +14,8 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2 import http_headers, responsecode
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2 import http_headers, responsecode
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx"> from txdav.common.datastore.test.util import populateCalendarsFrom, \
</span><span class="cx"> CommonCommonTests
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><del>-import twext.web2.dav.test.util
</del><ins>+import txweb2.dav.test.util
</ins><span class="cx"> from txdav.caldav.datastore.test.util import buildCalendarStore
</span><span class="cx">
</span><del>-class iSchedulePOST (CommonCommonTests, twext.web2.dav.test.util.TestCase):
</del><ins>+class iSchedulePOST (CommonCommonTests, txweb2.dav.test.util.TestCase):
</ins><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def setUp(self):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> from pycalendar.timezone import Timezone
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.http import HTTPError
</del><ins>+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -19,11 +19,11 @@
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.locking import NamedLock
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, Response
-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, Response
+from txweb2.http_headers import MimeType
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import messageForFailure, statusForFailure, \
</del><ins>+from txweb2.dav.http import messageForFailure, statusForFailure, \
</ins><span class="cx"> ErrorResponse
</span><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_implicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> from pycalendar.timezone import Timezone
</span><span class="cx">
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twistedcaldav.ical import Component as VComponent
</span><del>-from twext.web2.http_headers import MimeType, generateContentType
-from twext.web2.stream import readStream
</del><ins>+from txweb2.http_headers import MimeType, generateContentType
+from txweb2.stream import readStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="cx"> from twisted.python import hashlib
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_attachmentspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><del>-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.python.filepath import FilePath
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> LocalCalendarUser
</span><span class="cx"> from txdav.caldav.datastore.scheduling.caldav.scheduler import CalDAVScheduler
</span><span class="cx"> from txdav.caldav.datastore.scheduling.scheduler import ScheduleResponseQueue
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.caldav.datastore.scheduling.itip import iTIPRequestStatus
</span><span class="cx"> from twistedcaldav.instance import InvalidOverriddenInstanceError
</span><span class="cx">
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> from twext.enterprise.dal.syntax import Select, Parameter, Insert, Delete, \
</span><span class="cx"> Update
</span><span class="cx"> from twistedcaldav.ical import Component as VComponent
</span><del>-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, DeferredList, \
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> import textwrap
</span><span class="cx">
</span><span class="cx"> from twisted.trial.unittest import TestCase as BaseTestCase
</span><del>-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/util.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><del>-from twext.web2 import http_headers
</del><ins>+from txweb2 import http_headers
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.ical import InvalidICalendarDataError
</span><span class="cx"> from twistedcaldav.ical import Component as VComponent
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-# MIME helpers - mostly copied from twext.web2.static
</del><ins>+# MIME helpers - mostly copied from txweb2.static
</ins><span class="cx">
</span><span class="cx"> def loadMimeTypes(mimetype_locations=['/etc/mime.types']):
</span><span class="cx"> """
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> def __init__(self, attachment, contentType, dispositionName):
</span><span class="cx"> """
</span><span class="cx"> Create a storage transport with a reference to an L{IAttachment} and a
</span><del>- L{twext.web2.http_headers.MimeType}.
</del><ins>+ L{txweb2.http_headers.MimeType}.
</ins><span class="cx"> """
</span><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> self._clock = reactor
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavicalendarstorepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/icalendarstore.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/icalendarstore.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/icalendarstore.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx">
</span><span class="cx"> @param contentType: The content type of the data which will be stored.
</span><span class="cx">
</span><del>- @type contentType: L{twext.web2.http_headers.MimeType}
</del><ins>+ @type contentType: L{txweb2.http_headers.MimeType}
</ins><span class="cx">
</span><span class="cx"> @return: A transport which stores the contents written to it.
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/resource.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/resource.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from txdav.xml.base import dav_namespace
</span><del>-from twext.web2.http_headers import MimeType
-from twext.web2.http import RedirectResponse, Response
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.http_headers import MimeType
+from txweb2.http import RedirectResponse, Response
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> from twistedcaldav.caldavxml import caldav_namespace
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/file.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/file.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/carddav/datastore/file.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> from errno import ENOENT
</span><span class="cx">
</span><span class="cx"> from txdav.xml.rfc2518 import GETContentType
</span><del>-from twext.web2.dav.resource import TwistedGETContentMD5
-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2.dav.resource import TwistedGETContentMD5
+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> from twisted.python import hashlib
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/sql.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx"> Update, Union, Max, Select, utcNowSQL
</span><span class="cx"> from twext.enterprise.locking import NamedLock
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><del>-from twext.web2.http import HTTPError
-from twext.web2.http_headers import MimeType
-from twext.web2.responsecode import FORBIDDEN
</del><ins>+from txweb2.http import HTTPError
+from txweb2.http_headers import MimeType
+from txweb2.responsecode import FORBIDDEN
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.python import hashlib
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastoretestcommonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/test/common.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/test/common.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/carddav/datastore/test/common.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx">
</span><del>-from twext.web2.http import HTTPError
-from twext.web2.responsecode import FORBIDDEN
</del><ins>+from txweb2.http import HTTPError
+from txweb2.responsecode import FORBIDDEN
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, maybeDeferred
</span><span class="cx"> from twisted.python import hashlib
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/file.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/file.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/file.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from txdav.xml.rfc2518 import GETContentType, HRef
</span><span class="cx"> from txdav.xml.rfc5842 import ResourceID
</span><del>-from twext.web2.http_headers import generateContentType, MimeType
-from twext.web2.dav.resource import TwistedGETContentMD5, \
</del><ins>+from txweb2.http_headers import generateContentType, MimeType
+from txweb2.dav.resource import TwistedGETContentMD5, \
</ins><span class="cx"> TwistedQuotaUsedProperty
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> from twext.internet.decorate import memoizedKey, Memoizable
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> from twisted.application.service import Service
</span><span class="cx"> from twisted.internet import reactor
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/util.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> from twistedcaldav.ical import Component as VComponent
</span><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span><del>-from twext.web2.dav.resource import TwistedGETContentMD5
</del><ins>+from txweb2.dav.resource import TwistedGETContentMD5
</ins><span class="cx">
</span><span class="cx"> from twisted.application.service import Service
</span><span class="cx"> from twisted.internet import reactor
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_4_to_5py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.dav.resource import TwistedQuotaUsedProperty, TwistedGETContentMD5
</del><ins>+from txweb2.dav.resource import TwistedQuotaUsedProperty, TwistedGETContentMD5
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradetesttest_migratepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/test/test_migrate.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/test/test_migrate.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/test/test_migrate.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> from twext.enterprise.adbapi2 import Pickle
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span><del>-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, Deferred, returnValue
</span><span class="cx"> from twisted.internet.protocol import Protocol
</span></span></pre></div>
<a id="CalendarServertrunktxdavidavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/idav.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/idav.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/idav.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> using C{abort()}.
</span><span class="cx">
</span><span class="cx"> Also, keys must be L{IPropertyName} providers and values must be
</span><del>- L{twext.web2.element.dav.base.WeDAVElement}s.
</del><ins>+ L{txweb2.element.dav.base.WeDAVElement}s.
</ins><span class="cx"> """
</span><span class="cx"> # FIXME: the type for values isn't quite right, there should be some more
</span><span class="cx"> # specific interface for that.
</span></span></pre></div>
<a id="CalendarServertrunktxdavxmlbasepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/xml/base.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/xml/base.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/xml/base.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> import re
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.http_headers import parseDateTime
</del><ins>+from txweb2.http_headers import parseDateTime
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavxmlrfc2518py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/xml/rfc2518.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/xml/rfc2518.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/xml/rfc2518.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> __all__ = []
</span><span class="cx">
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2 import responsecode
+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx"> from txdav.xml.base import WebDAVElement, WebDAVTextElement, PCDATAElement
</span><span class="cx"> from txdav.xml.base import WebDAVEmptyElement, WebDAVOneShotElement
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> def fromResponseCode(clazz, code):
</span><span class="cx"> """
</span><span class="cx"> code must be an integer response code in
</span><del>- twext.web2.responsecode.RESPONSES.keys()
</del><ins>+ txweb2.responsecode.RESPONSES.keys()
</ins><span class="cx"> """
</span><span class="cx"> if code not in responsecode.RESPONSES:
</span><span class="cx"> raise ValueError("Invalid response code: %r" % (code,))
</span></span></pre></div>
<a id="CalendarServertrunktxdavxmltesttest_xml_rfc3744py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py (12099 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py 2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.resource import davPrivilegeSet
</del><ins>+from txweb2.dav.resource import davPrivilegeSet
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class XML_3744(unittest.TestCase):
</span></span></pre></div>
<a id="CalendarServertrunktxweb2__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/__init__.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/__init__.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test -*-
</del><ins>+# -*- test-case-name: txweb2.test -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2009 Twisted Matrix Laboratories.
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> """
</span><del>-twext.web2: a transitional package for Calendar Server to move from a
</del><ins>+txweb2: a transitional package for Calendar Server to move from a
</ins><span class="cx"> dependence on twisted.web2 to twisted.web.
</span><span class="cx">
</span><span class="cx"> This is a copy of (most of) twisted.web2, but the intention is for this package
</span><span class="lines">@@ -37,5 +37,5 @@
</span><span class="cx"> See U{http://twistedmatrix.com/trac/wiki/WebDevelopmentWithTwisted}.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-from twext.web2._version import version
</del><ins>+from txweb2._version import version
</ins><span class="cx"> __version__ = version.short()
</span></span></pre></div>
<a id="CalendarServertrunktxweb2_versionpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/_version.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/_version.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/_version.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx"> # This is an auto-generated file. Do not edit it.
</span><span class="cx"> from twisted.python import versions
</span><del>-version = versions.Version('twext.web2', 9, 0, 0)
</del><ins>+version = versions.Version('txweb2', 9, 0, 0)
</ins></span></pre></div>
<a id="CalendarServertrunktxweb2authbasicpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/auth/basic.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/auth/basic.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/auth/basic.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_httpauth -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_httpauth -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2006-2009 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> from twisted.cred import credentials, error
</span><span class="cx"> from twisted.internet.defer import succeed, fail
</span><del>-from twext.web2.auth.interfaces import ICredentialFactory
</del><ins>+from txweb2.auth.interfaces import ICredentialFactory
</ins><span class="cx">
</span><span class="cx"> from zope.interface import implements
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2authdigestpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/auth/digest.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/auth/digest.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/auth/digest.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_httpauth -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_httpauth -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2006-2009 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> calcResponse as _origCalcResponse,
</span><span class="cx"> calcHA2 as _origCalcHA2)
</span><span class="cx"> from twisted.internet.defer import maybeDeferred
</span><del>-from twext.web2.auth.interfaces import ICredentialFactory
</del><ins>+from txweb2.auth.interfaces import ICredentialFactory
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # The digest math
</span></span></pre></div>
<a id="CalendarServertrunktxweb2authinterfacespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/auth/interfaces.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/auth/interfaces.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/auth/interfaces.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> @type response: C{str}
</span><span class="cx"> @param response: scheme specific response string
</span><span class="cx">
</span><del>- @type request: L{twext.web2.server.Request}
</del><ins>+ @type request: L{txweb2.server.Request}
</ins><span class="cx"> @param request: the request being processed
</span><span class="cx">
</span><span class="cx"> @return: Deferred returning ICredentials
</span></span></pre></div>
<a id="CalendarServertrunktxweb2authwrapperpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/auth/wrapper.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/auth/wrapper.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/auth/wrapper.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_httpauth -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_httpauth -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -30,10 +30,10 @@
</span><span class="cx"> from twisted.cred import error, credentials
</span><span class="cx"> from twisted.internet.defer import gatherResults, succeed
</span><span class="cx"> from twisted.python import failure
</span><del>-from twext.web2 import responsecode
-from twext.web2 import http
-from twext.web2 import iweb
-from twext.web2.auth.interfaces import IAuthenticatedRequest
</del><ins>+from txweb2 import responsecode
+from txweb2 import http
+from txweb2 import iweb
+from txweb2.auth.interfaces import IAuthenticatedRequest
</ins><span class="cx">
</span><span class="cx"> class UnauthorizedResponse(http.StatusResponse):
</span><span class="cx"> """A specialized response class for generating www-authenticate headers
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> def __init__(self, wrappedResource, credentialFactories,
</span><span class="cx"> portal, interfaces):
</span><span class="cx"> """
</span><del>- @param wrappedResource: A L{twext.web2.iweb.IResource} to be returned
</del><ins>+ @param wrappedResource: A L{txweb2.iweb.IResource} to be returned
</ins><span class="cx"> from locateChild and render upon successful
</span><span class="cx"> authentication.
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2channel__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/channel/__init__.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/channel/__init__.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/channel/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_cgi,twext.web2.test.test_http -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_cgi,twext.web2.test.test_http -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -27,6 +27,6 @@
</span><span class="cx"> Various backend channel implementations for web2.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-from twext.web2.channel.http import HTTPFactory
</del><ins>+from txweb2.channel.http import HTTPFactory
</ins><span class="cx">
</span><span class="cx"> __all__ = ['HTTPFactory']
</span></span></pre></div>
<a id="CalendarServertrunktxweb2channelhttppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/channel/http.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/channel/http.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/channel/http.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_http -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_http -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2008-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -36,11 +36,11 @@
</span><span class="cx"> from twisted.protocols import policies, basic
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2 import http_headers
-from twext.web2 import http
-from twext.web2.http import RedirectResponse
-from twext.web2.server import Request
</del><ins>+from txweb2 import responsecode
+from txweb2 import http_headers
+from txweb2 import http
+from txweb2.http import RedirectResponse
+from txweb2.server import Request
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav import accounting
</span></span></pre></div>
<a id="CalendarServertrunktxweb2client__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/client/__init__.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/client/__init__.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/client/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_client -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_client -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2004 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunktxweb2clienthttppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/client/http.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/client/http.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/client/http.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_client -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_client -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -33,12 +33,12 @@
</span><span class="cx"> from twisted.protocols.basic import LineReceiver
</span><span class="cx"> from twisted.protocols.policies import TimeoutMixin
</span><span class="cx">
</span><del>-from twext.web2.responsecode import BAD_REQUEST, HTTP_VERSION_NOT_SUPPORTED
-from twext.web2.http import parseVersion, Response
-from twext.web2.http_headers import Headers
-from twext.web2.stream import ProducerStream, StreamProducer, IByteStream
-from twext.web2.channel.http import HTTPParser, PERSIST_NO_PIPELINE, PERSIST_PIPELINE
-from twext.web2.client.interfaces import IHTTPClientManager
</del><ins>+from txweb2.responsecode import BAD_REQUEST, HTTP_VERSION_NOT_SUPPORTED
+from txweb2.http import parseVersion, Response
+from txweb2.http_headers import Headers
+from txweb2.stream import ProducerStream, StreamProducer, IByteStream
+from txweb2.channel.http import HTTPParser, PERSIST_NO_PIPELINE, PERSIST_PIPELINE
+from txweb2.client.interfaces import IHTTPClientManager
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -68,11 +68,11 @@
</span><span class="cx"> @param headers: Headers to be sent to the server. It is important to
</span><span class="cx"> note that this object does not create any implicit headers. So it
</span><span class="cx"> is up to the HTTP Client to add required headers such as 'Host'.
</span><del>- @type headers: C{dict}, L{twext.web2.http_headers.Headers}, or
</del><ins>+ @type headers: C{dict}, L{txweb2.http_headers.Headers}, or
</ins><span class="cx"> C{None}
</span><span class="cx">
</span><span class="cx"> @param stream: Content body to send to the remote HTTP server.
</span><del>- @type stream: L{twext.web2.stream.IByteStream}
</del><ins>+ @type stream: L{txweb2.stream.IByteStream}
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> self.method = method
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx">
</span><span class="cx"> @rtype: L{twisted.internet.defer.Deferred}
</span><span class="cx"> @return: A Deferred which will be called back with the
</span><del>- L{twext.web2.http.Response} from the server.
</del><ins>+ L{txweb2.http.Response} from the server.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # Assert we're in a valid state to submit more
</span></span></pre></div>
<a id="CalendarServertrunktxweb2clientinterfacespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/client/interfaces.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/client/interfaces.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/client/interfaces.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_client -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_client -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2007 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunktxweb2dav__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/__init__.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/__init__.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test -*-
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2009 Twisted Matrix Laboratories.
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davauthpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/auth.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/auth.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/auth.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> from zope.interface import implements, Interface
</span><span class="cx"> from twisted.internet import defer
</span><span class="cx"> from twisted.cred import checkers, error, portal
</span><del>-from twext.web2.resource import WrapperResource
</del><ins>+from txweb2.resource import WrapperResource
</ins><span class="cx"> from txdav.xml.element import twisted_private_namespace, registerElement
</span><span class="cx"> from txdav.xml.element import WebDAVTextElement, Principal, HRef
</span><span class="cx">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> to allow anyone to challenge and handle authentication.
</span><span class="cx">
</span><span class="cx"> @param resource: L{DAVResource} FIXME: This should get promoted to
</span><del>- twext.web2.auth
</del><ins>+ txweb2.auth
</ins><span class="cx"> @param portal: The cred portal
</span><span class="cx"> @param wireEncryptedCredentialFactories: Sequence of credentialFactories
</span><span class="cx"> that can be used to authenticate by resources in this tree over a
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davfileoppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/fileop.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/fileop.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/fileop.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -47,10 +47,10 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse, HTTPError
-from twext.web2.stream import FileStream, readIntoFile
-from twext.web2.dav.http import ResponseQueue, statusForFailure
</del><ins>+from txweb2 import responsecode
+from txweb2.http import StatusResponse, HTTPError
+from txweb2.stream import FileStream, readIntoFile
+from txweb2.dav.http import ResponseQueue, statusForFailure
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davhttppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/http.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/http.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/http.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> from twisted.python.filepath import InsecurePath
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.http import Response, HTTPError, StatusResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.http import Response, HTTPError, StatusResponse
+from txweb2.http_headers import MimeType
+from txweb2.dav.util import joinURL
</ins><span class="cx"> from txdav.xml import element
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davidavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/idav.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/idav.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/idav.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> __all__ = [ "IDAVResource", "IDAVPrincipalResource", "IDAVPrincipalCollectionResource", ]
</span><span class="cx">
</span><del>-from twext.web2.iweb import IResource
</del><ins>+from txweb2.iweb import IResource
</ins><span class="cx">
</span><span class="cx"> class IDAVResource(IResource):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethod__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/__init__.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/__init__.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> WebDAV methods.
</span><span class="cx">
</span><span class="cx"> Modules in this package provide the implementation of
</span><del>-twext.web2.dav.static.DAVFile's dispatched methods.
</del><ins>+txweb2.dav.static.DAVFile's dispatched methods.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> __all__ = [
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodaclpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/acl.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/acl.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/acl.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_lock -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_lock -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse, HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.http import StatusResponse, HTTPError
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import davXMLFromStream
</del><ins>+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import davXMLFromStream
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodcopymovepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/copymove.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/copymove.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/copymove.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_copy,twext.web2.dav.test.test_move -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_copy,twext.web2.dav.test.test_move -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -32,17 +32,17 @@
</span><span class="cx"> from twisted.internet.defer import waitForDeferred, deferredGenerator
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.fileop import move
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.filter.location import addLocation
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.fileop import move
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.filter.location import addLocation
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.idav import IDAVResource
-from twext.web2.dav.method import put_common
-from twext.web2.dav.util import parentForURL
</del><ins>+from txweb2.dav.idav import IDAVResource
+from txweb2.dav.method import put_common
+from txweb2.dav.util import parentForURL
</ins><span class="cx">
</span><span class="cx"> # FIXME: This is circular
</span><del>-import twext.web2.dav.static
</del><ins>+import txweb2.dav.static
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> # So far, we need: .exists(), .fp.parent()
</span><span class="cx"> #
</span><span class="cx">
</span><del>- if not isinstance(destination, twext.web2.dav.static.DAVFile):
</del><ins>+ if not isinstance(destination, txweb2.dav.static.DAVFile):
</ins><span class="cx"> log.error("DAV copy between non-DAVFile DAV resources isn't implemented")
</span><span class="cx"> raise HTTPError(StatusResponse(
</span><span class="cx"> responsecode.NOT_IMPLEMENTED,
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethoddeletepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/delete.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/delete.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/delete.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_delete -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_delete -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> from twisted.internet.defer import waitForDeferred, deferredGenerator
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.method.delete_common import deleteResource
-from twext.web2.dav.util import parentForURL
</del><ins>+from txweb2.dav.method.delete_common import deleteResource
+from txweb2.dav.util import parentForURL
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethoddelete_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/delete_common.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/delete_common.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/delete_common.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_delete -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_delete -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx"> from twisted.internet.defer import waitForDeferred, deferredGenerator
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.dav.fileop import delete
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.dav.fileop import delete
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodgetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/get.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/get.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/get.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_lock -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_lock -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -29,24 +29,24 @@
</span><span class="cx">
</span><span class="cx"> __all__ = ["http_OPTIONS", "http_HEAD", "http_GET"]
</span><span class="cx">
</span><del>-import twext
</del><ins>+import txweb2
</ins><span class="cx">
</span><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.util import parentForURL
</del><ins>+from txweb2.dav.util import parentForURL
</ins><span class="cx">
</span><span class="cx"> def http_OPTIONS(self, request):
</span><span class="cx"> d = authorize(self, request)
</span><del>- d.addCallback(lambda _: super(twext.web2.dav.resource.DAVResource, self).http_OPTIONS(request))
</del><ins>+ d.addCallback(lambda _: super(txweb2.dav.resource.DAVResource, self).http_OPTIONS(request))
</ins><span class="cx"> return d
</span><span class="cx">
</span><span class="cx"> def http_HEAD(self, request):
</span><span class="cx"> d = authorize(self, request)
</span><del>- d.addCallback(lambda _: super(twext.web2.dav.resource.DAVResource, self).http_HEAD(request))
</del><ins>+ d.addCallback(lambda _: super(txweb2.dav.resource.DAVResource, self).http_HEAD(request))
</ins><span class="cx"> return d
</span><span class="cx">
</span><span class="cx"> def http_GET(self, request):
</span><span class="cx"> d = authorize(self, request)
</span><del>- d.addCallback(lambda _: super(twext.web2.dav.resource.DAVResource, self).http_GET(request))
</del><ins>+ d.addCallback(lambda _: super(txweb2.dav.resource.DAVResource, self).http_GET(request))
</ins><span class="cx"> return d
</span><span class="cx">
</span><span class="cx"> def authorize(self, request):
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodlockpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/lock.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/lock.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/lock.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_lock -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_lock -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> __all__ = ["http_LOCK", "http_UNLOCK"]
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx">
</span><span class="cx"> def http_LOCK(self, request):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodmkcolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/mkcol.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/mkcol.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/mkcol.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_mkcol -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_mkcol -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.fileop import mkcollection
-from twext.web2.dav.util import noDataFromStream, parentForURL
</del><ins>+from txweb2.dav.fileop import mkcollection
+from txweb2.dav.util import noDataFromStream, parentForURL
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodprop_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/prop_common.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/prop_common.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/prop_common.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -12,10 +12,10 @@
</span><span class="cx"> from twisted.python.failure import Failure
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element
</span><del>-from twext.web2.dav.http import statusForFailure
-from twext.web2.dav.method.propfind import propertyName
</del><ins>+from txweb2.dav.http import statusForFailure
+from txweb2.dav.method.propfind import propertyName
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodpropfindpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/propfind.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/propfind.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/propfind.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_prop.PROP.test_PROPFIND -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_prop.PROP.test_PROPFIND -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -36,13 +36,13 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.http import HTTPError
-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse
</del><ins>+from txweb2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.http import StatusResponse
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import MultiStatusResponse, statusForFailure, \
</del><ins>+from txweb2.dav.http import MultiStatusResponse, statusForFailure, \
</ins><span class="cx"> ErrorResponse
</span><del>-from twext.web2.dav.util import normalizeURL, davXMLFromStream
</del><ins>+from txweb2.dav.util import normalizeURL, davXMLFromStream
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodproppatchpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/proppatch.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/proppatch.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/proppatch.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_prop.PROP.test_PROPPATCH -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_prop.PROP.test_PROPPATCH -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -33,11 +33,11 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
-from twext.web2.dav.util import davXMLFromStream
</del><ins>+from txweb2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
+from txweb2.dav.util import davXMLFromStream
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodputpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/put.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/put.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/put.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_put -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_put -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.method import put_common
-from twext.web2.dav.util import parentForURL
</del><ins>+from txweb2.dav.method import put_common
+from txweb2.dav.util import parentForURL
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodput_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/put_common.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/put_common.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/put_common.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -29,15 +29,15 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, maybeDeferred, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.dav.fileop import copy, delete, put
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.resource import TwistedGETContentMD5
-from twext.web2.stream import MD5Stream
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import generateContentType
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2 import responsecode
+from txweb2.dav.fileop import copy, delete, put
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.resource import TwistedGETContentMD5
+from txweb2.stream import MD5Stream
+from txweb2.http import HTTPError
+from txweb2.http_headers import generateContentType
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.base import dav_namespace
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> """
</span><span class="cx"> Function that does common PUT/COPY/MOVE behaviour.
</span><span class="cx">
</span><del>- @param request: the L{twext.web2.server.Request} for the current HTTP request.
</del><ins>+ @param request: the L{txweb2.server.Request} for the current HTTP request.
</ins><span class="cx"> @param source: the L{DAVFile} for the source resource to copy from, or None if source data
</span><span class="cx"> is to be read from the request.
</span><span class="cx"> @param source_uri: the URI for the source resource.
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodreportpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/report.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/report.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_report -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_report -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import davXMLFromStream
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import davXMLFromStream
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.element import lookupElement
</span><span class="cx"> from txdav.xml.base import encodeXMLName
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodreport_acl_principal_prop_setpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/report_acl_principal_prop_set.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_acl_principal_prop_set.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2006-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -32,14 +32,14 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.http import MultiStatusResponse
-from twext.web2.dav.method import prop_common
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.method.report import max_number_of_matches
</del><ins>+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.http import MultiStatusResponse
+from txweb2.dav.method import prop_common
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.method.report import max_number_of_matches
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodreport_expandpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/report_expand.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/report_expand.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_expand.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -31,15 +31,15 @@
</span><span class="cx"> from twisted.python.failure import Failure
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element
</span><span class="cx"> from txdav.xml.element import dav_namespace
</span><del>-from twext.web2.dav.http import statusForFailure, MultiStatusResponse
-from twext.web2.dav.method import prop_common
-from twext.web2.dav.method.propfind import propertyName
-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2.dav.http import statusForFailure, MultiStatusResponse
+from txweb2.dav.method import prop_common
+from txweb2.dav.method.propfind import propertyName
+from txweb2.dav.resource import AccessDeniedError
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodreport_principal_matchpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/report_principal_match.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/report_principal_match.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_principal_match.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2006-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -33,15 +33,15 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse, HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.http import StatusResponse, HTTPError
</ins><span class="cx"> from txdav.xml import element
</span><span class="cx"> from txdav.xml.element import dav_namespace
</span><del>-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.method import prop_common
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.method.report import max_number_of_matches
-from twext.web2.dav.resource import isPrincipalResource
</del><ins>+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.method import prop_common
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.method.report import max_number_of_matches
+from txweb2.dav.resource import isPrincipalResource
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodreport_principal_property_searchpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/report_principal_property_search.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/report_principal_property_search.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_principal_property_search.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2006-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -32,16 +32,16 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx"> from txdav.xml.base import PCDATAElement
</span><span class="cx"> from txdav.xml import element
</span><span class="cx"> from txdav.xml.element import dav_namespace
</span><del>-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.method import prop_common
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.method.report import max_number_of_matches
-from twext.web2.dav.resource import isPrincipalResource
</del><ins>+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.method import prop_common
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.method.report import max_number_of_matches
+from txweb2.dav.resource import isPrincipalResource
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davmethodreport_principal_search_property_setpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/method/report_principal_search_property_set.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/method/report_principal_search_property_set.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_principal_search_property_set.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2006-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -32,10 +32,10 @@
</span><span class="cx"> from twisted.internet.defer import deferredGenerator
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.http import HTTPError, Response, StatusResponse
-from twext.web2.stream import MemoryStream
</del><ins>+from txweb2.http import HTTPError, Response, StatusResponse
+from txweb2.stream import MemoryStream
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davnonepropspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/noneprops.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/noneprops.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/noneprops.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx">
</span><span class="cx"> __all__ = ["NonePropertyStore"]
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
</ins><span class="cx"> from txdav.xml.base import encodeXMLName
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/resource.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/resource.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_resource -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_resource -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -64,19 +64,19 @@
</span><span class="cx"> from txdav.xml.element import dav_namespace
</span><span class="cx"> from txdav.xml.element import twisted_dav_namespace, twisted_private_namespace
</span><span class="cx"> from txdav.xml.element import registerElement, lookupElement
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, RedirectResponse, StatusResponse
-from twext.web2.http_headers import generateContentType
-from twext.web2.iweb import IResponse
-from twext.web2.resource import LeafResource
-from twext.web2.server import NoURLForResourceError
-from twext.web2.static import MetaDataMixin, StaticRenderMixin
-from twext.web2.auth.wrapper import UnauthorizedResponse
-from twext.web2.dav.idav import IDAVResource, IDAVPrincipalResource, IDAVPrincipalCollectionResource
-from twext.web2.dav.http import NeedPrivilegesResponse
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.dav.util import unimplemented, parentForURL, joinURL
-from twext.web2.dav.auth import PrincipalCredentials
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, RedirectResponse, StatusResponse
+from txweb2.http_headers import generateContentType
+from txweb2.iweb import IResponse
+from txweb2.resource import LeafResource
+from txweb2.server import NoURLForResourceError
+from txweb2.static import MetaDataMixin, StaticRenderMixin
+from txweb2.auth.wrapper import UnauthorizedResponse
+from txweb2.dav.idav import IDAVResource, IDAVPrincipalResource, IDAVPrincipalCollectionResource
+from txweb2.dav.http import NeedPrivilegesResponse
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.dav.util import unimplemented, parentForURL, joinURL
+from txweb2.dav.auth import PrincipalCredentials
</ins><span class="cx"> from twistedcaldav import customxml
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -969,7 +969,7 @@
</span><span class="cx">
</span><span class="cx"> In order to authenticate, the request must have been
</span><span class="cx"> previously prepared by
</span><del>- L{twext.web2.dav.auth.AuthenticationWrapper.hook} to have the
</del><ins>+ L{txweb2.dav.auth.AuthenticationWrapper.hook} to have the
</ins><span class="cx"> necessary authentication metadata.
</span><span class="cx">
</span><span class="cx"> If the request was not thusly prepared, both C{authzUser} and
</span><span class="lines">@@ -978,7 +978,7 @@
</span><span class="cx"> @param request: the request which may contain authentication
</span><span class="cx"> information and a reference to a portal to authenticate
</span><span class="cx"> against.
</span><del>- @type request: L{twext.web2.iweb.IRequest}.
</del><ins>+ @type request: L{txweb2.iweb.IRequest}.
</ins><span class="cx"> @return: a L{Deferred} which fires with a 2-tuple of
</span><span class="cx"> C{(authnUser, authzUser)} if either the request is
</span><span class="cx"> unauthenticated OR contains valid credentials to
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davstaticpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/static.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/static.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/static.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.dav.test.test_static -*-
</del><ins>+# -*- test-case-name: txweb2.dav.test.test_static -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -33,29 +33,29 @@
</span><span class="cx"> from twisted.internet.defer import succeed, deferredGenerator, waitForDeferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import http_headers
-from twext.web2 import responsecode
-from twext.web2.dav.resource import DAVResource, davPrivilegeSet
-from twext.web2.dav.resource import TwistedGETContentMD5
-from twext.web2.dav.util import bindMethods
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.static import File
</del><ins>+from txweb2 import http_headers
+from txweb2 import responsecode
+from txweb2.dav.resource import DAVResource, davPrivilegeSet
+from txweb2.dav.resource import TwistedGETContentMD5
+from txweb2.dav.util import bindMethods
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.static import File
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- from twext.web2.dav.xattrprops import xattrPropertyStore as DeadPropertyStore
</del><ins>+ from txweb2.dav.xattrprops import xattrPropertyStore as DeadPropertyStore
</ins><span class="cx"> except ImportError:
</span><span class="cx"> log.info("No dead property store available; using nonePropertyStore.")
</span><span class="cx"> log.info("Setting of dead properties will not be allowed.")
</span><del>- from twext.web2.dav.noneprops import NonePropertyStore as DeadPropertyStore
</del><ins>+ from txweb2.dav.noneprops import NonePropertyStore as DeadPropertyStore
</ins><span class="cx">
</span><span class="cx"> class DAVFile (DAVResource, File):
</span><span class="cx"> """
</span><span class="cx"> WebDAV-accessible File resource.
</span><span class="cx">
</span><del>- Extends twext.web2.static.File to handle WebDAV methods.
</del><ins>+ Extends txweb2.static.File to handle WebDAV methods.
</ins><span class="cx"> """
</span><span class="cx"> def __init__(
</span><span class="cx"> self, path,
</span><span class="lines">@@ -204,6 +204,6 @@
</span><span class="cx"> # Attach method handlers to DAVFile
</span><span class="cx"> #
</span><span class="cx">
</span><del>-import twext.web2.dav.method
</del><ins>+import txweb2.dav.method
</ins><span class="cx">
</span><del>-bindMethods(twext.web2.dav.method, DAVFile)
</del><ins>+bindMethods(txweb2.dav.method, DAVFile)
</ins></span></pre></div>
<a id="CalendarServertrunktxweb2davtest__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/__init__.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/__init__.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,5 +23,5 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Tests for twext.web2.dav.
</del><ins>+Tests for txweb2.dav.
</ins><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_aclpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_acl.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_acl.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_acl.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,22 +26,22 @@
</span><span class="cx">
</span><span class="cx"> from twisted.cred.portal import Portal
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.auth import basic
-from twext.web2.stream import MemoryStream
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.dav.auth import TwistedPasswordProperty, IPrincipal, DavRealm, TwistedPropertyChecker, AuthenticationWrapper
-from twext.web2.dav.fileop import rmdir
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import Site, serialize
-from twext.web2.dav.test.test_resource import \
</del><ins>+from txweb2 import responsecode
+from txweb2.auth import basic
+from txweb2.stream import MemoryStream
+from txweb2.dav.util import davXMLFromStream
+from txweb2.dav.auth import TwistedPasswordProperty, IPrincipal, DavRealm, TwistedPropertyChecker, AuthenticationWrapper
+from txweb2.dav.fileop import rmdir
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import Site, serialize
+from txweb2.dav.test.test_resource import \
</ins><span class="cx"> TestDAVPrincipalResource, TestPrincipalsCollection
</span><span class="cx">
</span><span class="cx"> from txdav.xml import element
</span><span class="cx">
</span><del>-import twext.web2.dav.test.util
</del><ins>+import txweb2.dav.test.util
</ins><span class="cx">
</span><del>-class ACL(twext.web2.dav.test.util.TestCase):
</del><ins>+class ACL(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> RFC 3744 (WebDAV ACL) tests.
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_authpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_auth.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_auth.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_auth.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,10 +23,10 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> import collections
</span><del>-from twext.web2.dav.auth import AuthenticationWrapper
-import twext.web2.dav.test.util
</del><ins>+from txweb2.dav.auth import AuthenticationWrapper
+import txweb2.dav.test.util
</ins><span class="cx">
</span><del>-class AutoWrapperTestCase(twext.web2.dav.test.util.TestCase):
</del><ins>+class AutoWrapperTestCase(txweb2.dav.test.util.TestCase):
</ins><span class="cx">
</span><span class="cx"> def test_basicAuthPrevention(self):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_copypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_copy.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_copy.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_copy.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> import os
</span><span class="cx"> import urllib
</span><span class="cx">
</span><del>-import twext.web2.dav.test.util
-from twext.web2 import responsecode
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import dircmp, serialize
-from twext.web2.dav.fileop import rmdir
</del><ins>+import txweb2.dav.test.util
+from txweb2 import responsecode
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import dircmp, serialize
+from txweb2.dav.fileop import rmdir
</ins><span class="cx">
</span><del>-class COPY(twext.web2.dav.test.util.TestCase):
</del><ins>+class COPY(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> COPY request
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_deletepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_delete.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_delete.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_delete.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> import urllib
</span><span class="cx"> import random
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import serialize
-import twext.web2.dav.test.util
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import serialize
+import txweb2.dav.test.util
</ins><span class="cx">
</span><del>-class DELETE(twext.web2.dav.test.util.TestCase):
</del><ins>+class DELETE(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> DELETE request
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_httppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_http.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_http.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_http.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -25,12 +25,12 @@
</span><span class="cx"> import errno
</span><span class="cx">
</span><span class="cx"> from twisted.python.failure import Failure
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.dav.http import ErrorResponse, statusForFailure
-import twext.web2.dav.test.util
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.dav.http import ErrorResponse, statusForFailure
+import txweb2.dav.test.util
</ins><span class="cx">
</span><del>-class HTTP(twext.web2.dav.test.util.TestCase):
</del><ins>+class HTTP(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> HTTP Utilities
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_lockpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_lock.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_lock.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_lock.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twisted.trial.unittest import SkipTest
</span><del>-import twext.web2.dav.test.util
</del><ins>+import txweb2.dav.test.util
</ins><span class="cx">
</span><del>-class LOCK_UNLOCK(twext.web2.dav.test.util.TestCase):
</del><ins>+class LOCK_UNLOCK(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> LOCK, UNLOCK requests
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_mkcolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_mkcol.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_mkcol.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_mkcol.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,14 +24,14 @@
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
-from twext.web2.dav.fileop import rmdir
-from twext.web2.test.test_server import SimpleRequest
-import twext.web2.dav.test.util
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
+from txweb2.dav.fileop import rmdir
+from txweb2.test.test_server import SimpleRequest
+import txweb2.dav.test.util
</ins><span class="cx">
</span><del>-class MKCOL(twext.web2.dav.test.util.TestCase):
</del><ins>+class MKCOL(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> MKCOL request
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_movepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_move.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_move.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_move.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,13 +24,13 @@
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-import twext.web2.dav.test.util
-import twext.web2.dav.test.test_copy
-from twext.web2 import responsecode
-from twext.web2.dav.test.util import serialize
-from twext.web2.dav.test.test_copy import sumFile
</del><ins>+import txweb2.dav.test.util
+import txweb2.dav.test.test_copy
+from txweb2 import responsecode
+from txweb2.dav.test.util import serialize
+from txweb2.dav.test.test_copy import sumFile
</ins><span class="cx">
</span><del>-class MOVE(twext.web2.dav.test.util.TestCase):
</del><ins>+class MOVE(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> MOVE request
</span><span class="cx"> """
</span><span class="lines">@@ -105,4 +105,4 @@
</span><span class="cx"> return serialize(self.send, work(self, test, dst=os.path.join(self.docroot, "elvislives!")))
</span><span class="cx">
</span><span class="cx"> def work(self, test, overwrite=None, dst=None):
</span><del>- return twext.web2.dav.test.test_copy.work(self, test, overwrite, dst, depths=(None,))
</del><ins>+ return txweb2.dav.test.test_copy.work(self, test, overwrite, dst, depths=(None,))
</ins></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_optionspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_options.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_options.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_options.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -22,12 +22,12 @@
</span><span class="cx"> # DRI: Wilfredo Sanchez, wsanchez@apple.com
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.iweb import IResponse
</del><ins>+from txweb2.iweb import IResponse
</ins><span class="cx">
</span><del>-import twext.web2.dav.test.util
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+import txweb2.dav.test.util
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><del>-class OPTIONS(twext.web2.dav.test.util.TestCase):
</del><ins>+class OPTIONS(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> OPTIONS request
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_pipelinepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_pipeline.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_pipeline.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_pipeline.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,10 +24,10 @@
</span><span class="cx"> import sys, os
</span><span class="cx">
</span><span class="cx"> from twisted.internet import utils
</span><del>-from twext.web2.test import test_server
-from twext.web2 import resource
-from twext.web2 import http
-from twext.web2.test import test_http
</del><ins>+from txweb2.test import test_server
+from txweb2 import resource
+from txweb2 import http
+from txweb2.test import test_http
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import waitForDeferred, deferredGenerator
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_proppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_prop.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_prop.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_prop.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -22,18 +22,18 @@
</span><span class="cx"> # DRI: Wilfredo Sanchez, wsanchez@apple.com
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
-from twext.web2 import http_headers
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import serialize
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
+from txweb2 import http_headers
+from txweb2.dav.util import davXMLFromStream
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import serialize
</ins><span class="cx">
</span><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.element import dav_namespace, lookupElement
</span><span class="cx">
</span><del>-import twext.web2.dav.test.util
</del><ins>+import txweb2.dav.test.util
</ins><span class="cx">
</span><span class="cx"> # Remove dynamic live properties that exist
</span><span class="cx"> dynamicLiveProperties = (
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>-class PROP(twext.web2.dav.test.util.TestCase):
</del><ins>+class PROP(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> PROPFIND, PROPPATCH requests
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_putpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_put.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_put.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_put.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -25,16 +25,16 @@
</span><span class="cx"> import os
</span><span class="cx"> import filecmp
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import FileStream
-from twext.web2.http import HTTPError
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import FileStream
+from txweb2.http import HTTPError
</ins><span class="cx">
</span><del>-import twext.web2.dav.test.util
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import serialize
</del><ins>+import txweb2.dav.test.util
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import serialize
</ins><span class="cx">
</span><del>-class PUT(twext.web2.dav.test.util.TestCase):
</del><ins>+class PUT(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> PUT request
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_quotapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_quota.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_quota.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_quota.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -22,17 +22,17 @@
</span><span class="cx"> # DRI: Wilfredo Sanchez, wsanchez@apple.com
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import FileStream
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import FileStream
</ins><span class="cx">
</span><del>-import twext.web2.dav.test.util
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import Site
</del><ins>+import txweb2.dav.test.util
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import Site
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-class QuotaBase(twext.web2.dav.test.util.TestCase):
</del><ins>+class QuotaBase(txweb2.dav.test.util.TestCase):
</ins><span class="cx">
</span><span class="cx"> def createDocumentRoot(self):
</span><span class="cx"> docroot = self.mktemp()
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_reportpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_report.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_report.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_report.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -22,15 +22,15 @@
</span><span class="cx"> # DRI: Wilfredo Sanchez, wsanchez@apple.com
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
-from twext.web2 import responsecode
</del><ins>+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
+from txweb2 import responsecode
</ins><span class="cx">
</span><del>-import twext.web2.dav.test.util
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+import txweb2.dav.test.util
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx">
</span><del>-class REPORT(twext.web2.dav.test.util.TestCase):
</del><ins>+class REPORT(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> REPORT request
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_report_expandpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_report_expand.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_report_expand.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_report_expand.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx">
</span><span class="cx"> from twisted.trial.unittest import SkipTest
</span><span class="cx">
</span><del>-import twext.web2.dav.test.util
</del><ins>+import txweb2.dav.test.util
</ins><span class="cx">
</span><del>-class REPORT_expand(twext.web2.dav.test.util.TestCase):
</del><ins>+class REPORT_expand(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> DAV:expand-property REPORT request
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_resource.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_resource.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -24,21 +24,21 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import DeferredList, waitForDeferred, deferredGenerator, succeed
</span><span class="cx"> from twisted.cred.portal import Portal
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.auth import basic
-from twext.web2.server import Site
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.auth import basic
+from txweb2.server import Site
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.dav.resource import DAVResource, AccessDeniedError, \
</del><ins>+from txweb2.dav.resource import DAVResource, AccessDeniedError, \
</ins><span class="cx"> DAVPrincipalResource, DAVPrincipalCollectionResource, davPrivilegeSet
</span><del>-from twext.web2.dav.auth import TwistedPasswordProperty, DavRealm, TwistedPropertyChecker, IPrincipal, AuthenticationWrapper
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import InMemoryPropertyStore
-import twext.web2.dav.test.util
</del><ins>+from txweb2.dav.auth import TwistedPasswordProperty, DavRealm, TwistedPropertyChecker, IPrincipal, AuthenticationWrapper
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import InMemoryPropertyStore
+import txweb2.dav.test.util
</ins><span class="cx">
</span><del>-class TestCase(twext.web2.dav.test.util.TestCase):
</del><ins>+class TestCase(txweb2.dav.test.util.TestCase):
</ins><span class="cx"> def setUp(self):
</span><del>- twext.web2.dav.test.util.TestCase.setUp(self)
</del><ins>+ txweb2.dav.test.util.TestCase.setUp(self)
</ins><span class="cx"> TestResource._cachedPropertyStores = {}
</span><span class="cx">
</span><span class="cx"> class GenericDAVResource(TestCase):
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_staticpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_static.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_static.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_static.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -22,10 +22,10 @@
</span><span class="cx"> # DRI: Wilfredo Sanchez, wsanchez@apple.com
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from twext.web2.dav.test import util
</del><ins>+from txweb2.dav.test import util
</ins><span class="cx"> from txdav.xml import element as davxml
</span><del>-from twext.web2.stream import readStream
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2.stream import readStream
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> class DAVFileTest(util.TestCase):
</span><span class="cx"> def test_renderPrivileges(self):
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_util.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_util.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><del>-from twext.web2.dav import util
</del><ins>+from txweb2.dav import util
</ins><span class="cx">
</span><span class="cx"> class Utilities(unittest.TestCase):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_xattrpropspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_xattrprops.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/test_xattrprops.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_xattrprops.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> # See LICENSE for details.
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Tests for L{twext.web2.dav.xattrprops}.
</del><ins>+Tests for L{txweb2.dav.xattrprops}.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from zlib import compress, decompress
</span><span class="lines">@@ -11,14 +11,14 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><del>-from twext.web2.responsecode import NOT_FOUND, INTERNAL_SERVER_ERROR
-from twext.web2.responsecode import FORBIDDEN
-from twext.web2.http import HTTPError
-from twext.web2.dav.static import DAVFile
</del><ins>+from txweb2.responsecode import NOT_FOUND, INTERNAL_SERVER_ERROR
+from txweb2.responsecode import FORBIDDEN
+from txweb2.http import HTTPError
+from txweb2.dav.static import DAVFile
</ins><span class="cx"> from txdav.xml.element import Depth, WebDAVDocument
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- from twext.web2.dav.xattrprops import xattrPropertyStore
</del><ins>+ from txweb2.dav.xattrprops import xattrPropertyStore
</ins><span class="cx"> except ImportError:
</span><span class="cx"> xattrPropertyStore = None
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/util.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/test/util.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -34,18 +34,18 @@
</span><span class="cx"> from twisted.internet.defer import Deferred
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2 import responsecode, server
-from twext.web2 import http_headers
-from twext.web2 import stream
</del><ins>+from txweb2.http import HTTPError, StatusResponse
+from txweb2 import responsecode, server
+from txweb2 import http_headers
+from txweb2 import stream
</ins><span class="cx">
</span><del>-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.dav.static import DAVFile
-from twext.web2.dav.util import joinURL
</del><ins>+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.dav.static import DAVFile
+from txweb2.dav.util import joinURL
</ins><span class="cx"> from txdav.xml import element
</span><span class="cx"> from txdav.xml.base import encodeXMLName
</span><del>-from twext.web2.http_headers import MimeType
-from twext.web2.dav.util import allDataFromStream
</del><ins>+from txweb2.http_headers import MimeType
+from txweb2.dav.util import allDataFromStream
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/util.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/util.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/util.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_util -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_util -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> from twisted.internet.defer import succeed
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.stream import readStream
</del><ins>+from txweb2.stream import readStream
</ins><span class="cx"> from txdav.xml.parser import WebDAVDocument
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davxattrpropspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/xattrprops.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/dav/xattrprops.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/xattrprops.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -52,9 +52,9 @@
</span><span class="cx"> from twisted.python.log import err
</span><span class="cx"> from txdav.xml.base import encodeXMLName
</span><span class="cx"> from txdav.xml.parser import WebDAVDocument
</span><del>-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav.http import statusForFailure
</del><ins>+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.dav.http import statusForFailure
</ins><span class="cx">
</span><span class="cx"> # RFC 2518 Section 12.13.1 says that removal of non-existing property
</span><span class="cx"> # is not an error. python-xattr on Linux fails with ENODATA in this
</span></span></pre></div>
<a id="CalendarServertrunktxweb2errorpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/error.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/error.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/error.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_log -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_log -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -24,11 +24,11 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Default error output filter for twext.web2.
</del><ins>+Default error output filter for txweb2.
</ins><span class="cx"> """
</span><span class="cx">
</span><del>-from twext.web2 import stream, http_headers
-from twext.web2.responsecode import (
</del><ins>+from txweb2 import stream, http_headers
+from txweb2.responsecode import (
</ins><span class="cx"> MOVED_PERMANENTLY, FOUND, SEE_OTHER, USE_PROXY, TEMPORARY_REDIRECT,
</span><span class="cx"> BAD_REQUEST, UNAUTHORIZED, PAYMENT_REQUIRED, FORBIDDEN, NOT_FOUND,
</span><span class="cx"> NOT_ALLOWED, NOT_ACCEPTABLE, PROXY_AUTH_REQUIRED, REQUEST_TIMEOUT, CONFLICT,
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> Handle errors which do not have any stream (i.e. output) associated with
</span><span class="cx"> them, so that users will see a nice message in their browser.
</span><span class="cx">
</span><del>- This is used as a response filter in L{twext.web2.server.Request}.
</del><ins>+ This is used as a response filter in L{txweb2.server.Request}.
</ins><span class="cx"> """
</span><span class="cx"> if response.stream is not None:
</span><span class="cx"> # Already got an error message
</span></span></pre></div>
<a id="CalendarServertrunktxweb2fileuploadpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/fileupload.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/fileupload.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/fileupload.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> import tempfile
</span><span class="cx">
</span><span class="cx"> from twisted.internet import defer
</span><del>-from twext.web2.stream import IStream, FileStream, BufferedStream, readStream
-from twext.web2.stream import generatorToStream, readAndDiscard
-from twext.web2 import http_headers
</del><ins>+from txweb2.stream import IStream, FileStream, BufferedStream, readStream
+from txweb2.stream import generatorToStream, readAndDiscard
+from txweb2 import http_headers
</ins><span class="cx"> from cStringIO import StringIO
</span><span class="cx">
</span><span class="cx"> ###################################
</span></span></pre></div>
<a id="CalendarServertrunktxweb2filter__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/filter/__init__.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/filter/__init__.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/filter/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_cgi -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_cgi -*-
</ins><span class="cx"> # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
</span><span class="cx"> # See LICENSE for details.
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2filtergzippy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/filter/gzip.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/filter/gzip.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/filter/gzip.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> from __future__ import generators
</span><span class="cx"> import struct
</span><span class="cx"> import zlib
</span><del>-from twext.web2 import stream
</del><ins>+from txweb2 import stream
</ins><span class="cx">
</span><span class="cx"> # TODO: ungzip (can any browsers actually generate gzipped
</span><span class="cx"> # upload data?) But it's necessary for client anyways.
</span></span></pre></div>
<a id="CalendarServertrunktxweb2filterlocationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/filter/location.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/filter/location.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/filter/location.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-from twext.web2 import responsecode
</del><ins>+from txweb2 import responsecode
</ins><span class="cx"> import urlparse
</span><span class="cx">
</span><span class="cx"> __all__ = ['addLocation']
</span></span></pre></div>
<a id="CalendarServertrunktxweb2filterrangepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/filter/range.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/filter/range.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/filter/range.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_stream -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_stream -*-
</ins><span class="cx">
</span><span class="cx"> import time, os
</span><span class="cx">
</span><del>-from twext.web2 import http, http_headers, responsecode, stream
</del><ins>+from txweb2 import http, http_headers, responsecode, stream
</ins><span class="cx">
</span><span class="cx"> # Some starts at writing a response filter to handle request ranges.
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2httppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/http.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/http.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/http.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_http -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_http -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx"> from zope.interface import implements
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import responsecode
-from twext.web2 import http_headers
-from twext.web2 import iweb
-from twext.web2 import stream
-from twext.web2.stream import IByteStream, readAndDiscard
</del><ins>+from txweb2 import responsecode
+from txweb2 import http_headers
+from txweb2 import iweb
+from txweb2 import stream
+from txweb2.stream import IByteStream, readAndDiscard
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -116,11 +116,11 @@
</span><span class="cx"> @type code: C{int}
</span><span class="cx">
</span><span class="cx"> @param headers: Headers to be sent to the client.
</span><del>- @type headers: C{dict}, L{twext.web2.http_headers.Headers}, or
</del><ins>+ @type headers: C{dict}, L{txweb2.http_headers.Headers}, or
</ins><span class="cx"> C{None}
</span><span class="cx">
</span><span class="cx"> @param stream: Content body to send to the HTTP client
</span><del>- @type stream: L{twext.web2.stream.IByteStream}
</del><ins>+ @type stream: L{txweb2.stream.IByteStream}
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if code is not None:
</span></span></pre></div>
<a id="CalendarServertrunktxweb2http_headerspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/http_headers.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/http_headers.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/http_headers.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_http_headers -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_http_headers -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2008 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunktxweb2iwebpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/iweb.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/iweb.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/iweb.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test -*-
</del><ins>+# -*- test-case-name: txweb2.test -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2008 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunktxweb2logpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/log.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/log.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/log.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_log -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_log -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> import time
</span><span class="cx"> from twisted.internet import defer
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import iweb, stream, resource
</del><ins>+from txweb2 import iweb, stream, resource
</ins><span class="cx"> from zope.interface import implements, Attribute, Interface
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span></span></pre></div>
<a id="CalendarServertrunktxweb2metafdpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/metafd.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/metafd.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/metafd.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_metafd -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_metafd -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2011-2013 Apple Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> InheritedPort, InheritedSocketDispatcher, InheritingProtocolFactory)
</span><span class="cx"> from twext.internet.tcp import MaxAcceptTCPServer
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2.channel.http import HTTPFactory
</del><ins>+from txweb2.channel.http import HTTPFactory
</ins><span class="cx"> from twisted.application.service import MultiService, Service
</span><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> from twisted.python.util import FancyStrMixin
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> This is instantiated in the I{worker process}.
</span><span class="cx">
</span><del>- @ivar site: a twext.web2 'site' object, i.e. a request factory
</del><ins>+ @ivar site: a txweb2 'site' object, i.e. a request factory
</ins><span class="cx">
</span><span class="cx"> @ivar fd: the file descriptor of a UNIX socket being used to receive
</span><span class="cx"> connections from a master process calling accept()
</span></span></pre></div>
<a id="CalendarServertrunktxweb2resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/resource.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/resource.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_server,twext.web2.test.test_resource -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_server,twext.web2.test.test_resource -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span><del>-from twext.web2 import iweb, http, server, responsecode
</del><ins>+from txweb2 import iweb, http, server, responsecode
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import maybeDeferred
</span><span class="cx"> class RenderMixin(object):
</span></span></pre></div>
<a id="CalendarServertrunktxweb2responsecodepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/responsecode.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/responsecode.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/responsecode.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test -*-
</del><ins>+# -*- test-case-name: txweb2.test -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span></span></pre></div>
<a id="CalendarServertrunktxweb2serverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/server.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/server.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/server.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_server -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_server -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2008 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx"> from twisted.python import failure
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.web2 import http, iweb, fileupload, responsecode
-from twext.web2 import http_headers
-from twext.web2.filter.range import rangefilter
-from twext.web2 import error
</del><ins>+from txweb2 import http, iweb, fileupload, responsecode
+from txweb2 import http_headers
+from txweb2.filter.range import rangefilter
+from txweb2 import error
</ins><span class="cx">
</span><del>-from twext.web2 import __version__ as web2_version
</del><ins>+from txweb2 import __version__ as web2_version
</ins><span class="cx"> from twisted import __version__ as twisted_version
</span><span class="cx">
</span><span class="cx"> VERSION = "Twisted/%s TwistedWeb/%s" % (twisted_version, web2_version)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> Parse data of a POST request.
</span><span class="cx">
</span><span class="cx"> @param request: the request to parse.
</span><del>- @type request: L{twext.web2.http.Request}.
</del><ins>+ @type request: L{txweb2.http.Request}.
</ins><span class="cx"> @param maxMem: maximum memory used during the parsing of the data.
</span><span class="cx"> @type maxMem: C{int}
</span><span class="cx"> @param maxFields: maximum number of form fields allowed.
</span></span></pre></div>
<a id="CalendarServertrunktxweb2staticpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/static.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/static.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/static.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_static -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_static -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2008 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx"> import tempfile
</span><span class="cx">
</span><span class="cx"> # Sibling Imports
</span><del>-from twext.web2 import http_headers, resource
-from twext.web2 import http, iweb, stream, responsecode, server
-from twext.web2.http import HTTPError
</del><ins>+from txweb2 import http_headers, resource
+from txweb2 import http, iweb, stream, responsecode, server
+from txweb2.http import HTTPError
</ins><span class="cx">
</span><span class="cx"> # Twisted Imports
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span></span></pre></div>
<a id="CalendarServertrunktxweb2streampy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/stream.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/stream.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/stream.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: twext.web2.test.test_stream -*-
</del><ins>+# -*- test-case-name: txweb2.test.test_stream -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
</span><span class="cx"> # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
</span><span class="lines">@@ -950,7 +950,7 @@
</span><span class="cx"> takes care of ensuring that the input is not a deferred before
</span><span class="cx"> you see it.
</span><span class="cx">
</span><del>- >>> from twext.web2 import stream
</del><ins>+ >>> from txweb2 import stream
</ins><span class="cx"> >>> from string import maketrans
</span><span class="cx"> >>> alphabet = 'abcdefghijklmnopqrstuvwxyz'
</span><span class="cx"> >>>
</span></span></pre></div>
<a id="CalendarServertrunktxweb2test__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/__init__.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/__init__.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/__init__.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx">
</span><span class="cx"> """
</span><span class="cx">
</span><del>-twext.web2.test: unittests for the Twext.Web2, Web Server Framework
</del><ins>+txweb2.test: unittests for the Twext.Web2, Web Server Framework
</ins><span class="cx">
</span><span class="cx"> """
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_client.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_client.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_client.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -8,10 +8,10 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet import protocol, defer
</span><span class="cx">
</span><del>-from twext.web2.client import http
-from twext.web2 import http_headers
-from twext.web2 import stream
-from twext.web2.test.test_http import LoopbackRelay, HTTPTests, TestConnection
</del><ins>+from txweb2.client import http
+from txweb2 import http_headers
+from txweb2 import stream
+from txweb2.test.test_http import LoopbackRelay, HTTPTests, TestConnection
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_fileuploadpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_fileupload.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_fileupload.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_fileupload.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -2,15 +2,15 @@
</span><span class="cx"> # See LICENSE for details.
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Tests for L{twext.web2.fileupload} and its different parsing functions.
</del><ins>+Tests for L{txweb2.fileupload} and its different parsing functions.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from twisted.internet import defer
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx"> from twisted.internet.defer import waitForDeferred, deferredGenerator
</span><span class="cx">
</span><del>-from twext.web2 import stream, fileupload
-from twext.web2.http_headers import MimeType
</del><ins>+from txweb2 import stream, fileupload
+from txweb2.http_headers import MimeType
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_httppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_http.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_http.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_http.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -6,15 +6,15 @@
</span><span class="cx"> from zope.interface import implements
</span><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><del>-from twext.web2 import http, http_headers, responsecode, iweb, stream
-from twext.web2 import channel
</del><ins>+from txweb2 import http, http_headers, responsecode, iweb, stream
+from txweb2 import channel
</ins><span class="cx">
</span><span class="cx"> from twisted.internet import reactor, protocol, address, interfaces, utils
</span><span class="cx"> from twisted.internet import defer
</span><span class="cx"> from twisted.internet.defer import waitForDeferred, deferredGenerator
</span><span class="cx"> from twisted.protocols import loopback
</span><span class="cx"> from twisted.python import util, runtime
</span><del>-from twext.web2.channel.http import SSLRedirectRequest, HTTPFactory, HTTPChannel
</del><ins>+from txweb2.channel.http import SSLRedirectRequest, HTTPFactory, HTTPChannel
</ins><span class="cx"> from twisted.internet.task import deferLater
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_http_headerspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_http_headers.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_http_headers.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_http_headers.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -2,15 +2,15 @@
</span><span class="cx"> # See LICENSE for details.
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Tests for L{twext.web2.http_headers}.
</del><ins>+Tests for L{txweb2.http_headers}.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx"> import random
</span><span class="cx"> import time
</span><span class="cx">
</span><del>-from twext.web2 import http_headers
-from twext.web2.http_headers import Cookie, HeaderHandler, quoteString, generateKeyValues
</del><ins>+from txweb2 import http_headers
+from txweb2.http_headers import Cookie, HeaderHandler, quoteString, generateKeyValues
</ins><span class="cx"> from twisted.python import util
</span><span class="cx">
</span><span class="cx"> class parsedvalue:
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_httpauthpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_httpauth.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_httpauth.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_httpauth.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -5,12 +5,12 @@
</span><span class="cx"> from twisted.internet import address
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx"> from twisted.cred import error
</span><del>-from twext.web2 import http, responsecode
-from twext.web2.auth import basic, digest, wrapper
-from twext.web2.auth.interfaces import IAuthenticatedRequest, IHTTPUser
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2 import http, responsecode
+from txweb2.auth import basic, digest, wrapper
+from txweb2.auth.interfaces import IAuthenticatedRequest, IHTTPUser
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><del>-from twext.web2.test import test_server
</del><ins>+from txweb2.test import test_server
</ins><span class="cx">
</span><span class="cx"> import base64
</span><span class="cx">
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> # FIXME: These tests are somewhat redundant with the tests for Twisted's
</span><span class="cx"> # built-in digest auth; these private values need to be patched to
</span><span class="cx"> # create deterministic results, but at some future point the whole
</span><del>- # digest module should be removed from twext.web2 (as all of twext.web2
</del><ins>+ # digest module should be removed from txweb2 (as all of twext.web2
</ins><span class="cx"> # should be removed) and we can just get rid of this.
</span><span class="cx">
</span><span class="cx"> twistedDigestFactory._generateNonce = _fakeStaticNonce
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_logpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_log.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_log.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_log.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -3,10 +3,10 @@
</span><span class="cx">
</span><span class="cx"> from twisted.python.log import addObserver, removeObserver
</span><span class="cx">
</span><del>-from twext.web2.log import BaseCommonAccessLoggingObserver, LogWrapperResource
-from twext.web2.http import Response
-from twext.web2.resource import Resource, WrapperResource
-from twext.web2.test.test_server import BaseCase, BaseTestResource
</del><ins>+from txweb2.log import BaseCommonAccessLoggingObserver, LogWrapperResource
+from txweb2.http import Response
+from txweb2.resource import Resource, WrapperResource
+from txweb2.test.test_server import BaseCase, BaseTestResource
</ins><span class="cx">
</span><span class="cx"> class BufferingLogObserver(BaseCommonAccessLoggingObserver):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_metafdpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_metafd.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_metafd.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_metafd.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -16,21 +16,21 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Tests for twext.web2.metafd.
</del><ins>+Tests for txweb2.metafd.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from socket import error as SocketError, AF_INET
</span><span class="cx"> from errno import ENOTCONN
</span><span class="cx">
</span><span class="cx"> from twext.internet import sendfdport
</span><del>-from twext.web2 import metafd
-from twext.web2.channel.http import HTTPChannel
-from twext.web2.metafd import ReportingHTTPService, ConnectionLimiter
</del><ins>+from txweb2 import metafd
+from txweb2.channel.http import HTTPChannel
+from txweb2.metafd import ReportingHTTPService, ConnectionLimiter
</ins><span class="cx"> from twisted.internet.tcp import Server
</span><span class="cx"> from twisted.application.service import Service
</span><span class="cx">
</span><span class="cx"> from twext.internet.test.test_sendfdport import ReaderAdder
</span><del>-from twext.web2.metafd import WorkerStatus
</del><ins>+from txweb2.metafd import WorkerStatus
</ins><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_resource.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_resource.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_resource.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> # See LICENSE for details.
</span><span class="cx">
</span><span class="cx"> """
</span><del>-A test harness for twext.web2.resource.
</del><ins>+A test harness for txweb2.resource.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from sets import Set as set
</span><span class="lines">@@ -11,13 +11,13 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, fail, inlineCallbacks
</span><span class="cx"> from twisted.trial import unittest
</span><del>-from twext.web2 import responsecode
-from twext.web2.iweb import IResource
-from twext.web2.http import Response
-from twext.web2.stream import MemoryStream
-from twext.web2.resource import RenderMixin, LeafResource
-from twext.web2.server import Site, StopTraversal
-from twext.web2.test.test_server import SimpleRequest
</del><ins>+from txweb2 import responsecode
+from txweb2.iweb import IResource
+from txweb2.http import Response
+from txweb2.stream import MemoryStream
+from txweb2.resource import RenderMixin, LeafResource
+from txweb2.server import Site, StopTraversal
+from txweb2.test.test_server import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> class PreconditionError (Exception):
</span><span class="cx"> "Precondition Failure"
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_serverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_server.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_server.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_server.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -2,15 +2,15 @@
</span><span class="cx"> # See LICENSE for details.
</span><span class="cx">
</span><span class="cx"> """
</span><del>-A test harness for the twext.web2 server.
</del><ins>+A test harness for the txweb2 server.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from zope.interface import implementer
</span><span class="cx">
</span><span class="cx"> from twisted.python import components
</span><del>-from twext.web2 import http, http_headers, iweb, server
-from twext.web2 import resource, stream
-from twext.web2.dav.test.util import SimpleRequest
</del><ins>+from txweb2 import http, http_headers, iweb, server
+from txweb2 import resource, stream
+from txweb2.dav.test.util import SimpleRequest
</ins><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx"> from twisted.internet import reactor, defer, address
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_staticpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_static.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_static.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_static.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -2,16 +2,16 @@
</span><span class="cx"> # See LICENSE for details.
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Tests for L{twext.web2.static}.
</del><ins>+Tests for L{txweb2.static}.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-from twext.web2.test.test_server import BaseCase
-from twext.web2 import static
-from twext.web2 import http_headers
-from twext.web2 import stream
-from twext.web2 import iweb
</del><ins>+from txweb2.test.test_server import BaseCase
+from txweb2 import static
+from txweb2 import http_headers
+from txweb2 import stream
+from txweb2 import iweb
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_streampy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_stream.py (12098 => 12100)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/web2/test/test_stream.py 2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_stream.py 2013-12-14 02:44:35 UTC (rev 12100)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> # See LICENSE for details.
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Tests for the stream implementations in L{twext.web2}.
</del><ins>+Tests for the stream implementations in L{txweb2}.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> import tempfile, sys, os
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> from twisted.python.hashlib import md5
</span><span class="cx"> from twisted.internet import reactor, defer, interfaces
</span><span class="cx"> from twisted.trial import unittest
</span><del>-from twext.web2 import stream
</del><ins>+from txweb2 import stream
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def bufstr(data):
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-__doctests__ = ['twext.web2.test.test_stream', 'twext.web2.stream']
</del><ins>+__doctests__ = ['txweb2.test.test_stream', 'twext.web2.stream']
</ins><span class="cx"> # TODO:
</span><span class="cx"> # CompoundStreamTest
</span><span class="cx"> # more tests for ProducerStreamTest
</span></span></pre>
</div>
</div>
</body>
</html>