<!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>[12061] 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/12061">12061</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 16:20:12 -0800 (Thu, 12 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Get rid of twext.python.vcomponent.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastorefilepy">CalendarServer/trunk/txdav/caldav/datastore/file.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretestcommonpy">CalendarServer/trunk/txdav/caldav/datastore/test/common.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_filepy">CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreutilpy">CalendarServer/trunk/txdav/caldav/datastore/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretestutilpy">CalendarServer/trunk/txdav/common/datastore/test/util.py</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextpythonvcomponentpy">CalendarServer/trunk/twext/python/vcomponent.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwextpythonvcomponentpy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/twext/python/vcomponent.py (12060 => 12061)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/python/vcomponent.py        2013-12-13 00:10:43 UTC (rev 12060)
+++ CalendarServer/trunk/twext/python/vcomponent.py        2013-12-13 00:20:12 UTC (rev 12061)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-##
-# Copyright (c) 2010-2013 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-&quot;&quot;&quot;
-iCalendar utilities
-&quot;&quot;&quot;
-
-__all__ = [
-    &quot;VComponent&quot;,
-    &quot;VProperty&quot;,
-    &quot;InvalidICalendarDataError&quot;,
-]
-
-# FIXME: Move twistedcaldav.ical here, but that module needs some
-# cleanup first.  Perhaps after porting to libical?
-
-from twistedcaldav.ical import Component as VComponent
-from twistedcaldav.ical import Property as VProperty
-from twistedcaldav.ical import InvalidICalendarDataError
</del></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py (12060 => 12061)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/file.py        2013-12-13 00:10:43 UTC (rev 12060)
+++ CalendarServer/trunk/txdav/caldav/datastore/file.py        2013-12-13 00:20:12 UTC (rev 12061)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed, fail
</span><span class="cx"> 
</span><del>-from twext.python.vcomponent import VComponent
</del><ins>+from twistedcaldav.ical import Component as VComponent
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.rfc2518 import GETContentType
</span><span class="cx"> from twext.web2.dav.resource import TwistedGETContentMD5
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx"> 
</span><span class="cx"> IGNORE_NAMES = ('dropbox', 'notification', 'freebusy')
</span><span class="cx"> 
</span><ins>+
+
</ins><span class="cx"> class CalendarHome(CommonHome):
</span><span class="cx">     implements(ICalendarHome)
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (12060 => 12061)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py        2013-12-13 00:10:43 UTC (rev 12060)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py        2013-12-13 00:20:12 UTC (rev 12061)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.python.vcomponent import VComponent
</del><ins>+from twistedcaldav.ical import Component as VComponent
</ins><span class="cx"> from twext.web2.http_headers import MimeType, generateContentType
</span><span class="cx"> from twext.web2.stream import readStream
</span><span class="cx"> 
</span><span class="lines">@@ -109,6 +109,8 @@
</span><span class="cx"> 
</span><span class="cx"> log = Logger()
</span><span class="cx"> 
</span><ins>+
+
</ins><span class="cx"> class CalendarStoreFeatures(object):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Manages store-wide operations specific to calendars.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretestcommonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/common.py (12060 => 12061)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/common.py        2013-12-13 00:10:43 UTC (rev 12060)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/common.py        2013-12-13 00:20:12 UTC (rev 12061)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> from twisted.python import hashlib
</span><span class="cx"> 
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><del>-from twext.python.vcomponent import VComponent
</del><ins>+from twistedcaldav.ical import Component as VComponent
</ins><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_filepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py (12060 => 12061)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py        2013-12-13 00:10:43 UTC (rev 12060)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py        2013-12-13 00:20:12 UTC (rev 12061)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx"> 
</span><del>-from twext.python.vcomponent import VComponent
</del><ins>+from twistedcaldav.ical import Component as VComponent
</ins><span class="cx"> 
</span><span class="cx"> from txdav.common.icommondatastore import HomeChildNameNotAllowedError
</span><span class="cx"> from txdav.common.icommondatastore import ObjectResourceNameNotAllowedError
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (12060 => 12061)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py        2013-12-13 00:10:43 UTC (rev 12060)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py        2013-12-13 00:20:12 UTC (rev 12061)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.enterprise.dal.syntax import Select, Parameter, Insert, Delete, \
</span><span class="cx">     Update
</span><del>-from twext.python.vcomponent import VComponent
</del><ins>+from twistedcaldav.ical import Component as VComponent
</ins><span class="cx"> from twext.web2.http_headers import MimeType
</span><span class="cx"> from twext.web2.stream import MemoryStream
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py (12060 => 12061)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/util.py        2013-12-13 00:10:43 UTC (rev 12060)
+++ CalendarServer/trunk/txdav/caldav/datastore/util.py        2013-12-13 00:20:12 UTC (rev 12061)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.web2 import http_headers
</span><span class="cx"> 
</span><del>-from twext.python.vcomponent import InvalidICalendarDataError
-from twext.python.vcomponent import VComponent
</del><ins>+from twistedcaldav.ical import InvalidICalendarDataError
+from twistedcaldav.ical import Component as VComponent
</ins><span class="cx"> 
</span><span class="cx"> from twistedcaldav import ical
</span><span class="cx"> from twistedcaldav.datafilters.hiddeninstance import HiddenInstanceFilter
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py (12060 => 12061)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/util.py        2013-12-13 00:10:43 UTC (rev 12060)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py        2013-12-13 00:20:12 UTC (rev 12061)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span><del>-from twext.python.vcomponent import VComponent
</del><ins>+from twistedcaldav.ical import Component as VComponent
</ins><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span><span class="cx"> from twext.web2.dav.resource import TwistedGETContentMD5
</span></span></pre>
</div>
</div>

</body>
</html>