[CalendarServer-changes] [12061] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 12061
          http://trac.calendarserver.org//changeset/12061
Author:   wsanchez at apple.com
Date:     2013-12-12 16:20:12 -0800 (Thu, 12 Dec 2013)
Log Message:
-----------
Get rid of twext.python.vcomponent.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/file.py
    CalendarServer/trunk/txdav/caldav/datastore/sql.py
    CalendarServer/trunk/txdav/caldav/datastore/test/common.py
    CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py
    CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
    CalendarServer/trunk/txdav/caldav/datastore/util.py
    CalendarServer/trunk/txdav/common/datastore/test/util.py

Removed Paths:
-------------
    CalendarServer/trunk/twext/python/vcomponent.py

Deleted: CalendarServer/trunk/twext/python/vcomponent.py
===================================================================
--- 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)
@@ -1,32 +0,0 @@
-##
-# Copyright (c) 2010-2013 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# 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 "AS IS" 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.
-##
-
-"""
-iCalendar utilities
-"""
-
-__all__ = [
-    "VComponent",
-    "VProperty",
-    "InvalidICalendarDataError",
-]
-
-# 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

Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py
===================================================================
--- 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)
@@ -35,7 +35,7 @@
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed, fail
 
-from twext.python.vcomponent import VComponent
+from twistedcaldav.ical import Component as VComponent
 from txdav.xml import element as davxml
 from txdav.xml.rfc2518 import GETContentType
 from twext.web2.dav.resource import TwistedGETContentMD5
@@ -78,6 +78,8 @@
 
 IGNORE_NAMES = ('dropbox', 'notification', 'freebusy')
 
+
+
 class CalendarHome(CommonHome):
     implements(ICalendarHome)
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- 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)
@@ -40,7 +40,7 @@
 from twext.python.clsprop import classproperty
 from twext.python.filepath import CachingFilePath
 from twext.python.log import Logger
-from twext.python.vcomponent import VComponent
+from twistedcaldav.ical import Component as VComponent
 from twext.web2.http_headers import MimeType, generateContentType
 from twext.web2.stream import readStream
 
@@ -109,6 +109,8 @@
 
 log = Logger()
 
+
+
 class CalendarStoreFeatures(object):
     """
     Manages store-wide operations specific to calendars.

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/common.py
===================================================================
--- 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)
@@ -27,7 +27,7 @@
 from twisted.python import hashlib
 
 from twext.python.clsprop import classproperty
-from twext.python.vcomponent import VComponent
+from twistedcaldav.ical import Component as VComponent
 from twext.python.filepath import CachingFilePath as FilePath
 from twext.enterprise.ienterprise import AlreadyFinishedError
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py
===================================================================
--- 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)
@@ -28,7 +28,7 @@
 
 from twext.python.filepath import CachingFilePath as FilePath
 
-from twext.python.vcomponent import VComponent
+from twistedcaldav.ical import Component as VComponent
 
 from txdav.common.icommondatastore import HomeChildNameNotAllowedError
 from txdav.common.icommondatastore import ObjectResourceNameNotAllowedError

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- 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)
@@ -32,7 +32,7 @@
 
 from twext.enterprise.dal.syntax import Select, Parameter, Insert, Delete, \
     Update
-from twext.python.vcomponent import VComponent
+from twistedcaldav.ical import Component as VComponent
 from twext.web2.http_headers import MimeType
 from twext.web2.stream import MemoryStream
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py
===================================================================
--- 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)
@@ -34,8 +34,8 @@
 
 from twext.web2 import http_headers
 
-from twext.python.vcomponent import InvalidICalendarDataError
-from twext.python.vcomponent import VComponent
+from twistedcaldav.ical import InvalidICalendarDataError
+from twistedcaldav.ical import Component as VComponent
 
 from twistedcaldav import ical
 from twistedcaldav.datafilters.hiddeninstance import HiddenInstanceFilter

Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py
===================================================================
--- 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)
@@ -38,7 +38,7 @@
 
 from twext.python.log import Logger
 from twext.python.filepath import CachingFilePath
-from twext.python.vcomponent import VComponent
+from twistedcaldav.ical import Component as VComponent
 from twext.enterprise.adbapi2 import ConnectionPool
 from twext.enterprise.ienterprise import AlreadyFinishedError
 from twext.web2.dav.resource import TwistedGETContentMD5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/26cd56fe/attachment.html>