[CalendarServer-changes] [1796] CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav /directory

[source_changes at macosforge.org]

Revision: 1796
          http://trac.macosforge.org/projects/calendarserver/changeset/1796
Author:   wsanchez at apple.com
Date:     2007-08-17 15:54:45 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
Pulled up r1794 r1795 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py
    CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/test/test_opendirectoryschema.py

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py	2007-08-17 19:28:58 UTC (rev 1795)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py	2007-08-17 22:54:45 UTC (rev 1796)
@@ -169,15 +169,9 @@
         for recordname, record in records.iteritems():
             # May have an apple-serviceinfo
             plist = record.get('dsAttrTypeNative:apple-serviceinfo', None)
-
             if not plist:
-                # May have XMLPlist value
-                plist = record.get(dsattributes.kDS1AttrXMLPlist, None)
+                continue
 
-                # Must have one of the other
-                if not plist:
-                    continue
-
             # XXX: Parse the plist so we can find only calendar vhosts with our hostname.
             plistDict = readPlistFromString(plist)
             vhosts = plistDict.get("com.apple.macosxserver.virtualhosts", None)

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/test/test_opendirectoryschema.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/test/test_opendirectoryschema.py	2007-08-17 19:28:58 UTC (rev 1795)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/test/test_opendirectoryschema.py	2007-08-17 22:54:45 UTC (rev 1796)
@@ -901,25 +901,25 @@
         record_good = ("computer1.apple.com", {
             dsattributes.kDS1AttrGeneratedUID     : "GUID1",
             dsattributes.kDSNAttrRecordName       : "computer1.apple.com",
-            dsattributes.kDS1AttrXMLPlist         : PlistParse.plist_good,
+            'dsAttrTypeNative:apple-serviceinfo'  : PlistParse.plist_good,
             dsattributes.kDSNAttrMetaNodeLocation : "/LDAPv3/127.0.0.1",
         })
         record_good_other = ("computer2.apple.com", {
             dsattributes.kDS1AttrGeneratedUID     : "GUID1",
             dsattributes.kDSNAttrRecordName       : "computer2.apple.com",
-            dsattributes.kDS1AttrXMLPlist         : PlistParse.plist_good_other,
+            'dsAttrTypeNative:apple-serviceinfo'  : PlistParse.plist_good_other,
             dsattributes.kDSNAttrMetaNodeLocation : "/LDAPv3/127.0.0.1",
         })
         record_good_duplicate = ("computer3.apple.com", {
             dsattributes.kDS1AttrGeneratedUID     : "GUID2",
             dsattributes.kDSNAttrRecordName       : "computer2.apple.com",
-            dsattributes.kDS1AttrXMLPlist         : PlistParse.plist_good,
+            'dsAttrTypeNative:apple-serviceinfo'  : PlistParse.plist_good,
             dsattributes.kDSNAttrMetaNodeLocation : "/LDAPv3/directory.apple.com",
         })
         record_good_local_duplicate = ("ServiceInformation", {
             dsattributes.kDS1AttrGeneratedUID     : "GUID3",
             dsattributes.kDSNAttrRecordName       : "computer2.apple.com",
-            dsattributes.kDS1AttrXMLPlist         : PlistParse.plist_good,
+            'dsAttrTypeNative:apple-serviceinfo'  : PlistParse.plist_good,
             dsattributes.kDSNAttrMetaNodeLocation : "/Local/Default",
         })
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070817/2e5df703/attachment.html