[CalendarServer-changes] [4352] CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py

[source_changes at macosforge.org]

Revision: 4352
          http://trac.macosforge.org/projects/calendarserver/changeset/4352
Author:   cdaboo at apple.com
Date:     2009-06-17 11:49:18 -0700 (Wed, 17 Jun 2009)
Log Message:
-----------
Suppress the invalid UUID warning - it is not a UUID it is a GUID.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py

Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py	2009-06-17 16:50:59 UTC (rev 4351)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py	2009-06-17 18:49:18 UTC (rev 4352)
@@ -293,12 +293,9 @@
                     self.shortNames.append(child.firstChild.data.encode("utf-8"))
             elif child_name == ELEMENT_GUID:
                 if child.firstChild is not None:
-                    guid = child.firstChild.data.encode("utf-8")
-                    try:
-                        UUID(guid)
-                    except ValueError, e:
-                        log.error("Invalid GUID (%s) in accounts XML: %r" % (e, guid))
-                    self.guid = guid
+                    self.guid = child.firstChild.data.encode("utf-8")
+                    if len(self.guid) < 4:
+                        self.guid += "?" * (4 - len(self.guid))
             elif child_name == ELEMENT_PASSWORD:
                 if child.firstChild is not None:
                     self.password = child.firstChild.data.encode("utf-8")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090617/190e6d35/attachment.html>