[CalendarServer-changes] [759]
CalendarServer/trunk/twistedcaldav/directory
source_changes at macosforge.org
source_changes at macosforge.org
Thu Dec 7 21:50:09 PST 2006
Revision: 759
http://trac.macosforge.org/projects/calendarserver/changeset/759
Author: wsanchez at apple.com
Date: 2006-12-07 21:50:08 -0800 (Thu, 07 Dec 2006)
Log Message:
-----------
Go, go, Gadget Sets!
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/apache.py
CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
CalendarServer/trunk/twistedcaldav/directory/idirectory.py
CalendarServer/trunk/twistedcaldav/directory/sqldb.py
CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
Modified: CalendarServer/trunk/twistedcaldav/directory/apache.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/apache.py 2006-12-08 04:37:15 UTC (rev 758)
+++ CalendarServer/trunk/twistedcaldav/directory/apache.py 2006-12-08 05:50:08 UTC (rev 759)
@@ -130,7 +130,7 @@
guid = None,
shortName = shortName,
fullName = None,
- calendarUserAddresses = (),
+ calendarUserAddresses = set(),
)
class AbstractUserRecord(AbstractDirectoryRecord):
Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2006-12-08 04:37:15 UTC (rev 758)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2006-12-08 05:50:08 UTC (rev 759)
@@ -118,7 +118,7 @@
guid = guid,
shortName = shortName,
fullName = None, # FIXME: Need to get this attribute
- calendarUserAddresses = (), # FIXME: Should be able to look up email, etc.
+ calendarUserAddresses = set(), # FIXME: Should be able to look up email, etc.
memberGUIDs = memberGUIDs,
)
Modified: CalendarServer/trunk/twistedcaldav/directory/idirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/idirectory.py 2006-12-08 04:37:15 UTC (rev 758)
+++ CalendarServer/trunk/twistedcaldav/directory/idirectory.py 2006-12-08 05:50:08 UTC (rev 759)
@@ -76,7 +76,7 @@
guid = Attribute("The GUID of this record.")
shortName = Attribute("The name of this record.")
fullName = Attribute("The full name of this record.")
- calendarUserAddresses = Attribute("The list of calendar user addresses for this record.")
+ calendarUserAddresses = Attribute("A set of calendar user addresses for this record.")
def members():
"""
Modified: CalendarServer/trunk/twistedcaldav/directory/sqldb.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/sqldb.py 2006-12-08 04:37:15 UTC (rev 758)
+++ CalendarServer/trunk/twistedcaldav/directory/sqldb.py 2006-12-08 05:50:08 UTC (rev 759)
@@ -87,25 +87,25 @@
uid = row[0]
password = row[1]
name = row[2]
- members = []
- groups = []
- calendarUserAddresses = []
+ members = set()
+ groups = set()
+ calendarUserAddresses = set()
# See if we have a group
if recordType == "group":
rowiter = self._db_execute("select UID from GROUPS where GRPUID = :1", uid)
for row in rowiter:
- members.append(row[0])
+ members.add(row[0])
# See if we are a member of a group
rowiter = self._db_execute("select GRPUID from GROUPS where UID = :1", uid)
for row in rowiter:
- groups.append(row[0])
+ groups.add(row[0])
# Get calendar user addresses
rowiter = self._db_execute("select CUADDR from CUADDRS where UID = :1", uid)
for row in rowiter:
- calendarUserAddresses.append(row[0])
+ calendarUserAddresses.add(row[0])
yield uid, password, name, members, groups, calendarUserAddresses
@@ -125,25 +125,25 @@
uid = result[0]
password = result[1]
name = result[2]
- members = []
- groups = []
- calendarUserAddresses = []
+ members = set()
+ groups = set()
+ calendarUserAddresses = set()
# See if we have a group
if recordType == "group":
rowiter = self._db_execute("select UID from GROUPS where GRPUID = :1", uid)
for row in rowiter:
- members.append(row[0])
+ members.add(row[0])
# See if we are a member of a group
rowiter = self._db_execute("select GRPUID from GROUPS where UID = :1", uid)
for row in rowiter:
- groups.append(row[0])
+ groups.add(row[0])
# Get calendar user addresses
rowiter = self._db_execute("select CUADDR from CUADDRS where UID = :1", uid)
for row in rowiter:
- calendarUserAddresses.append(row[0])
+ calendarUserAddresses.add(row[0])
return uid, password, name, members, groups, calendarUserAddresses
Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2006-12-08 04:37:15 UTC (rev 758)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2006-12-08 05:50:08 UTC (rev 759)
@@ -110,7 +110,7 @@
# Update group membership
for member in group.members:
if self.items.has_key(member):
- self.items[member].groups.append(group.uid)
+ self.items[member].groups.add(group.uid)
class XMLAccountRecord (object):
"""
@@ -125,9 +125,9 @@
self.uid = None
self.password = None
self.name = None
- self.members = []
- self.groups = []
- self.calendarUserAddresses = []
+ self.members = set()
+ self.groups = set()
+ self.calendarUserAddresses = set()
self.canproxy = False
def repeat(self, ctr):
@@ -149,12 +149,12 @@
name = self.name % ctr
else:
name = self.name
- calendarUserAddresses = []
+ calendarUserAddresses = set()
for cuaddr in self.calendarUserAddresses:
if cuaddr.find("%") != -1:
- calendarUserAddresses.append(cuaddr % ctr)
+ calendarUserAddresses.add(cuaddr % ctr)
else:
- calendarUserAddresses.append(cuaddr)
+ calendarUserAddresses.add(cuaddr)
result = XMLAccountRecord(self.recordType)
result.uid = uid
@@ -181,7 +181,7 @@
self._parseMembers(child)
elif child._get_localName() == ELEMENT_CUADDR:
if child.firstChild is not None:
- self.calendarUserAddresses.append(child.firstChild.data.encode("utf-8"))
+ self.calendarUserAddresses.add(child.firstChild.data.encode("utf-8"))
elif child._get_localName() == ELEMENT_CANPROXY:
CalDAVResource.proxyUsers.add(self.uid)
self.canproxy = True
@@ -191,4 +191,4 @@
for child in node._get_childNodes():
if child._get_localName() == ELEMENT_USERID:
if child.firstChild is not None:
- self.members.append(child.firstChild.data.encode("utf-8"))
+ self.members.add(child.firstChild.data.encode("utf-8"))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061207/f9074d7d/attachment.html
More information about the calendarserver-changes
mailing list