[CalendarServer-changes] [571]
CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/
directory
source_changes at macosforge.org
source_changes at macosforge.org
Wed Nov 22 15:37:29 PST 2006
Revision: 571
http://trac.macosforge.org/projects/calendarserver/changeset/571
Author: wsanchez at apple.com
Date: 2006-11-22 15:37:28 -0800 (Wed, 22 Nov 2006)
Log Message:
-----------
Use words
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/directory.py
CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/idirectory.py
CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/resource.py
CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py
CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlaccountsparser.py
CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlfile.py
Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/directory.py 2006-11-22 23:09:53 UTC (rev 570)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/directory.py 2006-11-22 23:37:28 UTC (rev 571)
@@ -44,6 +44,7 @@
##
# IDirectoryService
##
+
realmName = None
##
@@ -79,13 +80,13 @@
def __repr__(self):
return "<%s[%s@%s] %s(%s) %r>" % (self.__class__.__name__, self.recordType, self.service, self.guid, self.shortName, self.fullName)
- def __init__(self, service, recordType, guid, shortName, fullName=None, cuaddrs=None):
- self.service = service
- self.recordType = recordType
- self.guid = guid
- self.shortName = shortName
- self.fullName = fullName
- self.cuaddrs = cuaddrs
+ def __init__(self, service, recordType, guid, shortName, fullName=None, calendarUserAddresses=None):
+ self.service = service
+ self.recordType = recordType
+ self.guid = guid
+ self.shortName = shortName
+ self.fullName = fullName
+ self.calendarUserAddresses = calendarUserAddresses
def __cmp__(self, other):
if not isinstance(other, DirectoryRecord):
Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/idirectory.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/idirectory.py 2006-11-22 23:09:53 UTC (rev 570)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/idirectory.py 2006-11-22 23:37:28 UTC (rev 571)
@@ -64,12 +64,12 @@
"""
Directory Record
"""
- service = Attribute("The L{IDirectoryService} this record exists in.")
- recordType = Attribute("The type of this record.")
- guid = Attribute("The GUID of this record.")
- shortName = Attribute("The name of this record.")
- fullName = Attribute("The full name of this record.")
- cuaddrs = Attribute("The list of calendar user addresses for this record.")
+ service = Attribute("The L{IDirectoryService} this record exists in.")
+ recordType = Attribute("The type of this record.")
+ 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.")
def members():
"""
Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/resource.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/resource.py 2006-11-22 23:09:53 UTC (rev 570)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/resource.py 2006-11-22 23:37:28 UTC (rev 571)
@@ -285,6 +285,11 @@
def principalUID(self):
return self.record.shortName
+
+ def calendarUserAddresses(self):
+ # Add the principal URL to whatever calendar user addresses
+ # the directory record provides.
+ return (self.principalURL(),) + tuple(self.record.calendarUserAddresses)
def calendarHomeURLs(self):
# FIXME: self.directory.calendarHomesCollection smells like a hack
@@ -294,25 +299,7 @@
)
def scheduleInboxURL(self):
- """
- @return: the schedule INBOX URL for this principal.
- """
return joinURL(self.calendarHomeURLs()[0], "inbox/")
def scheduleOutboxURL(self):
- """
- @return: the schedule OUTBOX URL for this principal.
- """
return joinURL(self.calendarHomeURLs()[0], "outbox/")
-
- def calendarUserAddresses(self):
- # Each directory service record must define the set of calendar user addresses itself.
- # This may vary with the directory service actually being used.
- # All we do here is ensure that the principalURL is always in the set.
- if self.record.cuaddrs:
- if self.principalURL() not in self.record.cuaddrs:
- return tuple(self.record.cuaddrs) + (self.principalURL(),)
- else:
- return tuple(self.record.cuaddrs)
- else:
- return (self.principalURL(),)
Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py 2006-11-22 23:09:53 UTC (rev 570)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py 2006-11-22 23:37:28 UTC (rev 571)
@@ -85,11 +85,11 @@
rowiter = self._db_execute("select UID, PSWD, NAME from ACCOUNTS where TYPE = :1", recordType)
for row in rowiter:
uid = row[0]
- pswd = row[1]
+ password = row[1]
name = row[2]
members = []
groups = []
- cuaddrs = []
+ calendarUserAddresses = []
# See if we have a group
if recordType == "group":
@@ -105,9 +105,9 @@
# Get calendar user addresses
rowiter = self._db_execute("select CUADDR from CUADDRS where UID = :1", uid)
for row in rowiter:
- cuaddrs.append(row[0])
+ calendarUserAddresses.append(row[0])
- yield uid, pswd, name, members, groups, cuaddrs
+ yield uid, password, name, members, groups, calendarUserAddresses
def getRecord(self, recordType, uid):
# Get individual account record
@@ -123,11 +123,11 @@
return None
uid = result[0]
- pswd = result[1]
+ password = result[1]
name = result[2]
members = []
groups = []
- cuaddrs = []
+ calendarUserAddresses = []
# See if we have a group
if recordType == "group":
@@ -143,22 +143,22 @@
# Get calendar user addresses
rowiter = self._db_execute("select CUADDR from CUADDRS where UID = :1", uid)
for row in rowiter:
- cuaddrs.append(row[0])
+ calendarUserAddresses.append(row[0])
- return uid, pswd, name, members, groups, cuaddrs
+ return uid, password, name, members, groups, calendarUserAddresses
def _add_to_db(self, record):
# Do regular account entry
type = record.recordType
uid = record.uid
- pswd = record.pswd
+ password = record.password
name = record.name
canproxy = ('F', 'T')[record.canproxy]
self._db_execute(
"""
insert into ACCOUNTS (TYPE, UID, PSWD, NAME, CANPROXY)
values (:1, :2, :3, :4, :5)
- """, type, uid, pswd, name, canproxy
+ """, type, uid, password, name, canproxy
)
# Check for group
@@ -172,7 +172,7 @@
)
# CUAddress
- for cuaddr in record.cuaddrs:
+ for cuaddr in record.calendarUserAddresses:
self._db_execute(
"""
insert into CUADDRS (CUADDR, UID)
@@ -265,28 +265,28 @@
def listRecords(self, recordType):
for result in self.manager.listRecords(recordType):
yield SQLDirectoryRecord(
- service = self,
- recordType = recordType,
- shortName = result[0],
- pswd = result[1],
- name = result[2],
- members = result[3],
- groups = result[4],
- cuaddrs = result[5],
+ service = self,
+ recordType = recordType,
+ shortName = result[0],
+ password = result[1],
+ name = result[2],
+ members = result[3],
+ groups = result[4],
+ calendarUserAddresses = result[5],
)
def recordWithShortName(self, recordType, shortName):
result = self.manager.getRecord(recordType, shortName)
if result:
return SQLDirectoryRecord(
- service = self,
- recordType = recordType,
- shortName = result[0],
- pswd = result[1],
- name = result[2],
- members = result[3],
- groups = result[4],
- cuaddrs = result[5],
+ service = self,
+ recordType = recordType,
+ shortName = result[0],
+ password = result[1],
+ name = result[2],
+ members = result[3],
+ groups = result[4],
+ calendarUserAddresses = result[5],
)
return None
@@ -298,17 +298,17 @@
"""
XML based implementation implementation of L{IDirectoryRecord}.
"""
- def __init__(self, service, recordType, shortName, pswd, name, members, groups, cuaddrs):
+ def __init__(self, service, recordType, shortName, password, name, members, groups, calendarUserAddresses):
super(SQLDirectoryRecord, self).__init__(
- service = service,
- recordType = recordType,
- guid = None,
- shortName = shortName,
- fullName = name,
- cuaddrs = cuaddrs,
+ service = service,
+ recordType = recordType,
+ guid = None,
+ shortName = shortName,
+ fullName = name,
+ calendarUserAddresses = calendarUserAddresses,
)
- self.password = pswd
+ self.password = password
self._members = members
self._groups = groups
Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlaccountsparser.py 2006-11-22 23:09:53 UTC (rev 570)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlaccountsparser.py 2006-11-22 23:37:28 UTC (rev 571)
@@ -123,11 +123,11 @@
self.recordType = recordType
self.uid = None
- self.pswd = None
+ self.password = None
self.name = None
self.members = []
self.groups = []
- self.cuaddrs = []
+ self.calendarUserAddresses = []
self.canproxy = False
def repeat(self, ctr):
@@ -141,27 +141,27 @@
uid = self.uid % ctr
else:
uid = self.uid
- if self.pswd.find("%") != -1:
- pswd = self.pswd % ctr
+ if self.password.find("%") != -1:
+ password = self.password % ctr
else:
- pswd = self.pswd
+ password = self.password
if self.name.find("%") != -1:
name = self.name % ctr
else:
name = self.name
- cuaddrs = []
- for cuaddr in self.cuaddrs:
+ calendarUserAddresses = []
+ for cuaddr in self.calendarUserAddresses:
if cuaddr.find("%") != -1:
- cuaddrs.append(cuaddr % ctr)
+ calendarUserAddresses.append(cuaddr % ctr)
else:
- cuaddrs.append(cuaddr)
+ calendarUserAddresses.append(cuaddr)
result = XMLAccountRecord(self.recordType)
result.uid = uid
- result.pswd = pswd
+ result.password = password
result.name = name
result.members = self.members
- result.cuaddrs = cuaddrs
+ result.calendarUserAddresses = calendarUserAddresses
result.canproxy = self.canproxy
return result
@@ -173,7 +173,7 @@
self.uid = child.firstChild.data.encode("utf-8")
elif child._get_localName() == ELEMENT_PASSWORD:
if child.firstChild is not None:
- self.pswd = child.firstChild.data.encode("utf-8")
+ self.password = child.firstChild.data.encode("utf-8")
elif child._get_localName() == ELEMENT_NAME:
if child.firstChild is not None:
self.name = child.firstChild.data.encode("utf-8")
@@ -181,7 +181,7 @@
self._parseMembers(child)
elif child._get_localName() == ELEMENT_CUADDR:
if child.firstChild is not None:
- self.cuaddrs.append(child.firstChild.data.encode("utf-8"))
+ self.calendarUserAddresses.append(child.firstChild.data.encode("utf-8"))
elif child._get_localName() == ELEMENT_CANPROXY:
CalDAVResource.proxyUsers.add(self.uid)
self.canproxy = True
Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlfile.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlfile.py 2006-11-22 23:09:53 UTC (rev 570)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlfile.py 2006-11-22 23:37:28 UTC (rev 571)
@@ -95,15 +95,15 @@
"""
def __init__(self, service, recordType, shortName, xmlPrincipal):
super(XMLDirectoryRecord, self).__init__(
- service = service,
- recordType = recordType,
- guid = None,
- shortName = shortName,
- fullName = xmlPrincipal.name,
- cuaddrs = xmlPrincipal.cuaddrs
+ service = service,
+ recordType = recordType,
+ guid = None,
+ shortName = shortName,
+ fullName = xmlPrincipal.name,
+ calendarUserAddresses = xmlPrincipal.calendarUserAddresses
)
- self.password = xmlPrincipal.pswd
+ self.password = xmlPrincipal.password
self._members = xmlPrincipal.members
self._groups = xmlPrincipal.groups
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061122/ebc8c3dd/attachment.html
More information about the calendarserver-changes
mailing list