[CalendarServer-changes] [12039] CalendarServer/branches/users/sagen/groupcacher
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:15:46 PDT 2014
Revision: 12039
http://trac.calendarserver.org//changeset/12039
Author: gaya at apple.com
Date: 2013-12-05 16:03:28 -0800 (Thu, 05 Dec 2013)
Log Message:
-----------
normalize group attendees
Modified Paths:
--------------
CalendarServer/branches/users/sagen/groupcacher/conf/caldavd-test.plist
CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py
CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/directory.py
CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/xmlfile.py
CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/stdconfig.py
Added Paths:
-----------
CalendarServer/branches/users/sagen/groupcacher/twext/who/test/accounts/
CalendarServer/branches/users/sagen/groupcacher/twext/who/test/accounts/accounts.xml
CalendarServer/branches/users/sagen/groupcacher/twext/who/test/accounts/resources.xml
Modified: CalendarServer/branches/users/sagen/groupcacher/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/conf/caldavd-test.plist 2013-12-05 16:42:49 UTC (rev 12038)
+++ CalendarServer/branches/users/sagen/groupcacher/conf/caldavd-test.plist 2013-12-06 00:03:28 UTC (rev 12039)
@@ -771,6 +771,8 @@
<false/>
<key>AllowResourceAsOrganizer</key>
<false/>
+ <key>AllowGroupAsAttendee</key>
+ <true/>
<key>AttendeeRefreshBatch</key>
<integer>0</integer>
<key>AttendeeRefreshCountLimit</key>
Added: CalendarServer/branches/users/sagen/groupcacher/twext/who/test/accounts/accounts.xml
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/twext/who/test/accounts/accounts.xml (rev 0)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/test/accounts/accounts.xml 2013-12-06 00:03:28 UTC (rev 12039)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006-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.
+ -->
+
+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
+<accounts realm="Test Realm">
+ <user>
+ <uid>admin</uid>
+ <guid>admin</guid>
+ <password>admin</password>
+ <name>Super User</name>
+ <first-name>Super</first-name>
+ <last-name>User</last-name>
+ </user>
+ <user>
+ <uid>apprentice</uid>
+ <guid>apprentice</guid>
+ <password>apprentice</password>
+ <name>Apprentice Super User</name>
+ <first-name>Apprentice</first-name>
+ <last-name>Super User</last-name>
+ </user>
+ <user>
+ <uid>wsanchez</uid>
+ <guid>wsanchez</guid>
+ <email-address>wsanchez at example.com</email-address>
+ <password>test</password>
+ <name>Wilfredo Sanchez Vega</name>
+ <first-name>Wilfredo</first-name>
+ <last-name>Sanchez Vega</last-name>
+ </user>
+ <user>
+ <uid>cdaboo</uid>
+ <guid>cdaboo</guid>
+ <email-address>cdaboo at example.com</email-address>
+ <password>test</password>
+ <name>Cyrus Daboo</name>
+ <first-name>Cyrus</first-name>
+ <last-name>Daboo</last-name>
+ </user>
+ <user>
+ <uid>sagen</uid>
+ <guid>sagen</guid>
+ <email-address>sagen at example.com</email-address>
+ <password>test</password>
+ <name>Morgen Sagen</name>
+ <first-name>Morgen</first-name>
+ <last-name>Sagen</last-name>
+ </user>
+ <user>
+ <uid>dre</uid>
+ <guid>andre</guid>
+ <email-address>dre at example.com</email-address>
+ <password>test</password>
+ <name>Andre LaBranche</name>
+ <first-name>Andre</first-name>
+ <last-name>LaBranche</last-name>
+ </user>
+ <user>
+ <uid>glyph</uid>
+ <guid>glyph</guid>
+ <email-address>glyph at example.com</email-address>
+ <password>test</password>
+ <name>Glyph Lefkowitz</name>
+ <first-name>Glyph</first-name>
+ <last-name>Lefkowitz</last-name>
+ </user>
+ <user>
+ <uid>i18nuser</uid>
+ <guid>i18nuser</guid>
+ <email-address>i18nuser at example.com</email-address>
+ <password>i18nuser</password>
+ <name>まだ</name>
+ <first-name>ま</first-name>
+ <last-name>だ</last-name>
+ </user>
+ <user repeat="101">
+ <uid>user%02d</uid>
+ <uid>User %02d</uid>
+ <guid>user%02d</guid>
+ <password>user%02d</password>
+ <name>User %02d</name>
+ <first-name>User</first-name>
+ <last-name>%02d</last-name>
+ <email-address>user%02d at example.com</email-address>
+ </user>
+ <user repeat="10">
+ <uid>public%02d</uid>
+ <guid>public%02d</guid>
+ <password>public%02d</password>
+ <name>Public %02d</name>
+ <first-name>Public</first-name>
+ <last-name>%02d</last-name>
+ </user>
+ <group>
+ <uid>group01</uid>
+ <guid>group01</guid>
+ <password>group01</password>
+ <name>Group 01</name>
+ <email-address>group01 at example.com</email-address>
+ <members>
+ <member type="users">user01</member>
+ </members>
+ </group>
+ <group>
+ <uid>group02</uid>
+ <guid>group02</guid>
+ <password>group02</password>
+ <name>Group 02</name>
+ <members>
+ <member type="users">user06</member>
+ <member type="users">user07</member>
+ </members>
+ </group>
+ <group>
+ <uid>group03</uid>
+ <guid>group03</guid>
+ <password>group03</password>
+ <name>Group 03</name>
+ <members>
+ <member type="users">user08</member>
+ <member type="users">user09</member>
+ </members>
+ </group>
+ <group>
+ <uid>group04</uid>
+ <guid>group04</guid>
+ <password>group04</password>
+ <name>Group 04</name>
+ <members>
+ <member type="groups">group02</member>
+ <member type="groups">group03</member>
+ <member type="users">user10</member>
+ </members>
+ </group>
+ <group> <!-- delegategroup -->
+ <uid>group05</uid>
+ <guid>group05</guid>
+ <password>group05</password>
+ <name>Group 05</name>
+ <members>
+ <member type="groups">group06</member>
+ <member type="users">user20</member>
+ </members>
+ </group>
+ <group> <!-- delegatesubgroup -->
+ <uid>group06</uid>
+ <guid>group06</guid>
+ <password>group06</password>
+ <name>Group 06</name>
+ <members>
+ <member type="users">user21</member>
+ </members>
+ </group>
+ <group> <!-- readonlydelegategroup -->
+ <uid>group07</uid>
+ <guid>group07</guid>
+ <password>group07</password>
+ <name>Group 07</name>
+ <members>
+ <member type="users">user22</member>
+ <member type="users">user23</member>
+ <member type="users">user24</member>
+ </members>
+ </group>
+ <group>
+ <uid>disabledgroup</uid>
+ <guid>disabledgroup</guid>
+ <password>disabledgroup</password>
+ <name>Disabled Group</name>
+ <members>
+ <member type="users">user01</member>
+ </members>
+ </group>
+</accounts>
Added: CalendarServer/branches/users/sagen/groupcacher/twext/who/test/accounts/resources.xml
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/twext/who/test/accounts/resources.xml (rev 0)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/test/accounts/resources.xml 2013-12-06 00:03:28 UTC (rev 12039)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006-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.
+ -->
+
+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
+<accounts realm="Test Realm">
+ <location repeat="10">
+ <uid>location%02d</uid>
+ <guid>location%02d</guid>
+ <password>location%02d</password>
+ <name>Room %02d</name>
+ </location>
+ <resource repeat="10">
+ <uid>resource%02d</uid>
+ <guid>resource%02d</guid>
+ <password>resource%02d</password>
+ <name>Resource %02d</name>
+ </resource>
+</accounts>
Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py 2013-12-05 16:42:49 UTC (rev 12038)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py 2013-12-06 00:03:28 UTC (rev 12039)
@@ -73,7 +73,7 @@
record = yield self.xmlService.recordWithUID("__top_group_1__")
yield self.groupCacher.refreshGroup(txn, record.guid)
- groupID, name, membershipHash = (yield txn.groupByGUID(record.guid))
+ groupID, name, membershipHash = (yield txn.groupByGUID(record.guid)) #@UnusedVariable
self.assertEquals(membershipHash, "4b0e162f2937f0f3daa6d10e5a6a6c33")
groupGUID, name, membershipHash = (yield txn.groupByID(groupID))
@@ -232,3 +232,132 @@
</directory>
"""
+
+
+
+from twisted.trial import unittest
+from twistedcaldav.config import config
+from twistedcaldav.ical import Component, normalize_iCalStr
+
+from txdav.caldav.datastore.test.util import buildCalendarStore
+from txdav.common.datastore.test.util import populateCalendarsFrom, \
+ CommonCommonTests
+
+import os
+from calendarserver.tap.util import directoryFromConfig
+
+class GroupAttendeeReconciliation(CommonCommonTests, unittest.TestCase):
+ """
+ CalendarObject splitting tests
+ """
+
+ @inlineCallbacks
+ def setUp(self):
+ config.Scheduling.Options.AllowGroupAsAttendee = True
+
+ yield super(GroupAttendeeReconciliation, self).setUp()
+ self.patch(config.DirectoryService.params, "xmlFile",
+ os.path.join(
+ os.path.dirname(__file__), "accounts", "accounts.xml"
+ )
+ )
+ self.patch(config.ResourceService.params, "xmlFile",
+ os.path.join(
+ os.path.dirname(__file__), "accounts", "resources.xml"
+ )
+ )
+ self._sqlCalendarStore = yield buildCalendarStore(self, self.notifierFactory, directoryFromConfig(config))
+ yield self.populate()
+
+ self.paths = {}
+
+
+ def storeUnderTest(self):
+ """
+ Create and return a L{CalendarStore} for testing.
+ """
+ return self._sqlCalendarStore
+
+
+ @inlineCallbacks
+ def populate(self):
+ yield populateCalendarsFrom(self.requirements, self.storeUnderTest())
+ self.notifierFactory.reset()
+
+ requirements = {
+ "user01" : {
+ "calendar" : {}
+ },
+ }
+
+ @inlineCallbacks
+ def test_groupAttendeeReconciliation(self):
+ """
+ Test that (manual) splitting of calendar objects works.
+ """
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
+
+ data_put = """BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20140101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at ninevah.local
+ORGANIZER:MAILTO:user01 at example.com
+ATTENDEE:mailto:user01 at example.com
+ATTENDEE:mailto:user02 at example.com
+ATTENDEE:MAILTO:group01 at example.com
+END:VEVENT
+END:VCALENDAR"""
+
+ data_get = """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20140101T100000
+DURATION:PT1H
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:uuid:user01
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:uuid:user02
+ATTENDEE;CN=Group 01;EMAIL=group01 at example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:uuid:group01
+CREATED:20060101T150000Z
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:uuid:user01
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
+"""
+
+ vcalendar = Component.fromString(data_put)
+ cobj = yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
+ self.assertFalse(hasattr(cobj, "_workItems"))
+ yield self.commit()
+
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
+ vcalendar = yield cobj.component()
+ print("normalize_iCalStr(vcalendar)=%s" % (normalize_iCalStr(vcalendar),))
+ print("normalize_iCalStr(data_get)=%s" % (normalize_iCalStr(data_get),))
+ self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get))
Modified: CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/directory.py 2013-12-05 16:42:49 UTC (rev 12038)
+++ CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/directory.py 2013-12-06 00:03:28 UTC (rev 12039)
@@ -238,9 +238,15 @@
else:
record = self.recordWithShortName(parts[2], parts[3])
- return record if record and record.enabledForCalendaring else None
+ if record:
+ if record.enabledForCalendaring or (
+ config.Scheduling.Options.AllowGroupAsAttendee and
+ record.recordType == record.service.recordType_groups):
+ return record
+ return None
+
def recordWithCachedGroupsAlias(self, recordType, alias): #@UnusedVariable
"""
@param recordType: the type of the record to look up.
@@ -1141,8 +1147,11 @@
@see: L{IDirectoryRecord.calendarUserAddresses}.
"""
- if not self.enabledForCalendaring:
+ if not self.enabledForCalendaring and (
+ not config.Scheduling.Options.AllowGroupAsAttendee and
+ self.recordType != self.service.recordType_groups):
return frozenset()
+
cuas = set(
["mailto:%s" % (emailAddress,)
for emailAddress in self.emailAddresses]
Modified: CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/xmlfile.py
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/xmlfile.py 2013-12-05 16:42:49 UTC (rev 12038)
+++ CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/xmlfile.py 2013-12-06 00:03:28 UTC (rev 12039)
@@ -251,8 +251,12 @@
cua = normalizeCUAddr(cua)
for recordType in self.recordTypes():
record = self._lookupInIndex(recordType, self.INDEX_TYPE_CUA, cua)
- if record and record.enabledForCalendaring:
- return record
+ if record:
+ if record.enabledForCalendaring or (
+ config.Scheduling.Options.AllowGroupAsAttendee and
+ recordType == record.service.recordType_groups):
+ return record
+
return None
@@ -436,9 +440,9 @@
os.chown(self.xmlFile.path, uid, gid)
- def createRecord(self, recordType, guid=None, shortNames=(), authIDs=set(),
+ def createRecord(self, recordType, guid=None, shortNames=(), authIDs=set(), #@UnusedVariable
fullName=None, firstName=None, lastName=None, emailAddresses=set(),
- uid=None, password=None, **kwargs):
+ uid=None, password=None, **kwargs): #@UnusedVariable
"""
Create and persist a record using the provided information. In this
XML-based implementation, the xml accounts are read in and converted
@@ -482,7 +486,7 @@
return self.recordWithGUID(guid)
- def destroyRecord(self, recordType, guid=None):
+ def destroyRecord(self, recordType, guid=None): #@UnusedVariable
"""
Remove the record matching guid. In this XML-based implementation,
the xml accounts are read in and those not matching the given guid are
@@ -506,9 +510,9 @@
self._forceReload()
- def updateRecord(self, recordType, guid=None, shortNames=(), authIDs=set(),
+ def updateRecord(self, recordType, guid=None, shortNames=(), authIDs=set(), #@UnusedVariable
fullName=None, firstName=None, lastName=None, emailAddresses=set(),
- uid=None, password=None, **kwargs):
+ uid=None, password=None, **kwargs): #@UnusedVariable
"""
Update the record matching guid. In this XML-based implementation,
the xml accounts are read in and converted to elementtree elements.
Modified: CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/stdconfig.py 2013-12-05 16:42:49 UTC (rev 12038)
+++ CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/stdconfig.py 2013-12-06 00:03:28 UTC (rev 12039)
@@ -723,6 +723,7 @@
"AllowResourceAsOrganizer" : False, # Allow resources to be Organizers
"AllowLocationWithoutOrganizer" : True, # Allow locations to have events without an Organizer
"AllowResourceWithoutOrganizer" : True, # Allow resources to have events without an Organizer
+ "AllowGroupAsAttendee" : False, # Allow groups to be Attendees
"TrackUnscheduledLocationData" : True, # Track who the last modifier of an unscheduled location event is
"TrackUnscheduledResourceData" : True, # Track who the last modifier of an unscheduled resource event is
"LimitFreeBusyAttendees" : 30, # Maximum number of attendees to request freebusy for
@@ -1141,7 +1142,7 @@
]
-def _updateDataStore(configDict, reloading=False):
+def _updateDataStore(configDict, reloading=False): #@UnusedVariable
"""
Post-update configuration hook for making all configured paths relative to
their respective root directories rather than the current working directory.
@@ -1190,7 +1191,7 @@
-def _updateHostName(configDict, reloading=False):
+def _updateHostName(configDict, reloading=False): #@UnusedVariable
if not configDict.ServerHostName:
hostname = getfqdn()
if not hostname:
@@ -1199,7 +1200,7 @@
-def _updateMultiProcess(configDict, reloading=False):
+def _updateMultiProcess(configDict, reloading=False): #@UnusedVariable
"""
Dynamically compute ProcessCount if it's set to 0. Always compute
MaxConnections and SharedBuffers based on ProcessCount, ExtraConnections,
@@ -1232,7 +1233,7 @@
-def _preUpdateDirectoryService(configDict, items, reloading=False):
+def _preUpdateDirectoryService(configDict, items, reloading=False): #@UnusedVariable
# Special handling for directory services configs
dsType = items.get("DirectoryService", {}).get("type", None)
if dsType is None:
@@ -1254,7 +1255,7 @@
-def _postUpdateDirectoryService(configDict, reloading=False):
+def _postUpdateDirectoryService(configDict, reloading=False): #@UnusedVariable
if configDict.DirectoryService.type in DEFAULT_SERVICE_PARAMS:
for param in tuple(configDict.DirectoryService.params):
if param not in DEFAULT_SERVICE_PARAMS[configDict.DirectoryService.type]:
@@ -1262,7 +1263,7 @@
-def _preUpdateResourceService(configDict, items, reloading=False):
+def _preUpdateResourceService(configDict, items, reloading=False): #@UnusedVariable
# Special handling for directory services configs
dsType = items.get("ResourceService", {}).get("type", None)
if dsType is None:
@@ -1284,7 +1285,7 @@
-def _postUpdateResourceService(configDict, reloading=False):
+def _postUpdateResourceService(configDict, reloading=False): #@UnusedVariable
if configDict.ResourceService.type in DEFAULT_RESOURCE_PARAMS:
for param in tuple(configDict.ResourceService.params):
if param not in DEFAULT_RESOURCE_PARAMS[configDict.ResourceService.type]:
@@ -1292,7 +1293,7 @@
-def _preUpdateDirectoryAddressBookBackingDirectoryService(configDict, items, reloading=False):
+def _preUpdateDirectoryAddressBookBackingDirectoryService(configDict, items, reloading=False): #@UnusedVariable
#
# Special handling for directory address book configs
#
@@ -1322,7 +1323,7 @@
-def _postUpdateAugmentService(configDict, reloading=False):
+def _postUpdateAugmentService(configDict, reloading=False): #@UnusedVariable
if configDict.AugmentService.type in DEFAULT_AUGMENT_PARAMS:
for param in tuple(configDict.AugmentService.params):
if param not in DEFAULT_AUGMENT_PARAMS[configDict.AugmentService.type]:
@@ -1331,7 +1332,7 @@
-def _postUpdateProxyDBService(configDict, reloading=False):
+def _postUpdateProxyDBService(configDict, reloading=False): #@UnusedVariable
if configDict.ProxyDBService.type in DEFAULT_PROXYDB_PARAMS:
for param in tuple(configDict.ProxyDBService.params):
if param not in DEFAULT_PROXYDB_PARAMS[configDict.ProxyDBService.type]:
@@ -1340,7 +1341,7 @@
-def _updateACLs(configDict, reloading=False):
+def _updateACLs(configDict, reloading=False): #@UnusedVariable
#
# Base resource ACLs
#
@@ -1426,7 +1427,7 @@
-def _updateRejectClients(configDict, reloading=False):
+def _updateRejectClients(configDict, reloading=False): #@UnusedVariable
#
# Compile RejectClients expressions for speed
#
@@ -1437,7 +1438,7 @@
-def _updateLogLevels(configDict, reloading=False):
+def _updateLogLevels(configDict, reloading=False): #@UnusedVariable
log.publisher.levels.clearLogLevels()
try:
@@ -1514,7 +1515,7 @@
-def _updateICalendar(configDict, reloading=False):
+def _updateICalendar(configDict, reloading=False): #@UnusedVariable
"""
Updated support iCalendar components.
"""
@@ -1557,7 +1558,7 @@
-def _updateServers(configDict, reloading=False):
+def _updateServers(configDict, reloading=False): #@UnusedVariable
from txdav.caldav.datastore.scheduling.ischedule.localservers import Servers
if configDict.Servers.Enabled:
Servers.load()
@@ -1569,7 +1570,7 @@
-def _updateCompliance(configDict, reloading=False):
+def _updateCompliance(configDict, reloading=False): #@UnusedVariable
if configDict.EnableCalDAV:
if configDict.Scheduling.CalDAV.OldDraftCompatibility:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/50855a32/attachment.html>
More information about the calendarserver-changes
mailing list