[CalendarServer-changes] [7244] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 7244
          http://trac.macosforge.org/projects/calendarserver/changeset/7244
Author:   cdaboo at apple.com
Date:     2011-03-24 07:36:39 -0700 (Thu, 24 Mar 2011)
Log Message:
-----------
Make sure PUT with blank lines in iCalendar data is handled and fixed.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/_event_create.py
    CalendarServer/trunk/contrib/performance/benchmarks/vfreebusy.py
    CalendarServer/trunk/contrib/performance/loadtest/ical.py
    CalendarServer/trunk/contrib/performance/loadtest/profiles.py
    CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
    CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py
    CalendarServer/trunk/support/build.sh

Modified: CalendarServer/trunk/contrib/performance/_event_create.py
===================================================================
--- CalendarServer/trunk/contrib/performance/_event_create.py	2011-03-24 14:35:56 UTC (rev 7243)
+++ CalendarServer/trunk/contrib/performance/_event_create.py	2011-03-24 14:36:39 UTC (rev 7244)
@@ -33,7 +33,7 @@
 from httpclient import StringProducer
 
 
-# XXX Represent these as vobjects?  Would make it easier to add more vevents.
+# XXX Represent these as pycalendar objects?  Would make it easier to add more vevents.
 event = """\
 BEGIN:VCALENDAR
 VERSION:2.0

Modified: CalendarServer/trunk/contrib/performance/benchmarks/vfreebusy.py
===================================================================
--- CalendarServer/trunk/contrib/performance/benchmarks/vfreebusy.py	2011-03-24 14:35:56 UTC (rev 7243)
+++ CalendarServer/trunk/contrib/performance/benchmarks/vfreebusy.py	2011-03-24 14:36:39 UTC (rev 7244)
@@ -32,7 +32,7 @@
 from httpclient import StringProducer
 from benchlib import initialize, sample
 
-# XXX Represent these as vobjects?  Would make it easier to add more vevents.
+# XXX Represent these as pycalendar objects?  Would make it easier to add more vevents.
 event = """\
 BEGIN:VCALENDAR
 VERSION:2.0

Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/ical.py	2011-03-24 14:35:56 UTC (rev 7243)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py	2011-03-24 14:36:39 UTC (rev 7244)
@@ -23,9 +23,9 @@
 from xml.etree import ElementTree
 ElementTree.QName.__repr__ = lambda self: '<QName %r>' % (self.text,)
 
-from vobject import readComponents
-from vobject.base import ContentLine
-from vobject.icalendar import VEvent, dateTimeToString
+#from vobject import readComponents
+#from vobject.base import ContentLine
+#from vobject.icalendar import VEvent, dateTimeToString
 
 from twisted.python.log import addObserver, err, msg
 from twisted.python.filepath import FilePath

Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/profiles.py	2011-03-24 14:35:56 UTC (rev 7243)
+++ CalendarServer/trunk/contrib/performance/loadtest/profiles.py	2011-03-24 14:36:39 UTC (rev 7244)
@@ -24,9 +24,9 @@
 
 from datetime import datetime, timedelta
 
-from vobject import readComponents
-from vobject.base import Component, ContentLine
-from vobject.icalendar import VEvent
+#from vobject import readComponents
+#from vobject.base import Component, ContentLine
+#from vobject.icalendar import VEvent
 
 from protocol.caldav.definitions import caldavxml
 

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2011-03-24 14:35:56 UTC (rev 7243)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2011-03-24 14:36:39 UTC (rev 7244)
@@ -15,8 +15,8 @@
 #
 ##
 
-from vobject import readComponents
-from vobject.base import Component, ContentLine
+#from vobject import readComponents
+#from vobject.base import Component, ContentLine
 
 from twisted.internet.defer import Deferred
 from twisted.trial.unittest import TestCase

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py	2011-03-24 14:35:56 UTC (rev 7243)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py	2011-03-24 14:36:39 UTC (rev 7244)
@@ -19,7 +19,7 @@
 Tests for loadtest.profiles.
 """
 
-from vobject import readComponents
+#from vobject import readComponents
 
 from protocol.caldav.definitions import caldavxml
 

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2011-03-24 14:35:56 UTC (rev 7243)
+++ CalendarServer/trunk/support/build.sh	2011-03-24 14:36:39 UTC (rev 7244)
@@ -644,7 +644,7 @@
     "http://svn.osafoundation.org/vobject/trunk";
 
   # XXX actually PyCalendar should be imported in-place.
-  py_dependency -fe -i "src" -r 150 \
+  py_dependency -fe -i "src" -r 151 \
     "pycalendar" "pycalendar" "pycalendar" \
     "http://svn.mulberrymail.com/repos/PyCalendar/branches/server";
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110324/8a65fd31/attachment-0001.html>