[CalendarServer-changes] [11000] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 11000
          http://trac.calendarserver.org//changeset/11000
Author:   dre at apple.com
Date:     2013-04-04 16:21:35 -0700 (Thu, 04 Apr 2013)
Log Message:
-----------
Revert r10997 and do a slightly better hack workaround

Revision Links:
--------------
    http://trac.calendarserver.org//changeset/10997

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/purge.py
    CalendarServer/trunk/twistedcaldav/scheduling/caldav/resource.py

Modified: CalendarServer/trunk/calendarserver/tools/purge.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/purge.py	2013-04-04 20:12:06 UTC (rev 10999)
+++ CalendarServer/trunk/calendarserver/tools/purge.py	2013-04-04 23:21:35 UTC (rev 11000)
@@ -17,9 +17,9 @@
 ##
 from __future__ import print_function
 
-from calendarserver.tools.cmdline import utilityMain, WorkerService
 from calendarserver.tap.util import FakeRequest
 from calendarserver.tools import tables
+from calendarserver.tools.cmdline import utilityMain, WorkerService
 from calendarserver.tools.util import removeProxy
 
 from getopt import getopt, GetoptError

Modified: CalendarServer/trunk/twistedcaldav/scheduling/caldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/caldav/resource.py	2013-04-04 20:12:06 UTC (rev 10999)
+++ CalendarServer/trunk/twistedcaldav/scheduling/caldav/resource.py	2013-04-04 23:21:35 UTC (rev 11000)
@@ -40,6 +40,11 @@
 from twistedcaldav.caldavxml import caldav_namespace, Opaque, \
     CalendarFreeBusySet, ScheduleCalendarTransp
 from twistedcaldav.config import config
+# _schedulePrivilegeSet implicitly depends on config being initilialized. The
+# following line is wrong because _schedulePrivilegeSet won't actually use the
+# config file, it will pick up stdconfig whenver it is imported, so this works
+# around that for now.
+__import__("twistedcaldav.stdconfig") # FIXME
 from twistedcaldav.customxml import calendarserver_namespace
 from twistedcaldav.ical import allowedComponents
 from twistedcaldav.resource import CalDAVResource
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130404/d0d34437/attachment-0001.html>