[CalendarServer-changes] [9274] CalendarServer/branches/users/glyph/uuid-normalize/twistedcaldav/ directory/xmlaccountsparser.py

[source_changes at macosforge.org]

Revision: 9274
          http://trac.macosforge.org/projects/calendarserver/changeset/9274
Author:   glyph at apple.com
Date:     2012-05-24 13:33:35 -0700 (Thu, 24 May 2012)
Log Message:
-----------
Normalize UUIDs during parsing, so that we don't need to worry about re-writing the file.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/uuid-normalize/twistedcaldav/directory/xmlaccountsparser.py

Modified: CalendarServer/branches/users/glyph/uuid-normalize/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/branches/users/glyph/uuid-normalize/twistedcaldav/directory/xmlaccountsparser.py	2012-05-24 20:33:32 UTC (rev 9273)
+++ CalendarServer/branches/users/glyph/uuid-normalize/twistedcaldav/directory/xmlaccountsparser.py	2012-05-24 20:33:35 UTC (rev 9274)
@@ -176,15 +176,15 @@
         def expand(text, ctr):
             """
             Returns a string where ~<number> is replaced by the first <number>
-            characters from the md5 hexdigest of str(ctr), e.g.:
+            characters from the md5 hexdigest of str(ctr), e.g.::
 
                 expand("~9 foo", 1)
 
-            returns:
+            returns::
 
                 "c4ca4238a foo"
 
-            ...since "c4ca4238a" is the first 9 characters of:
+            ...since "c4ca4238a" is the first 9 characters of::
 
                 hashlib.md5(str(1)).hexdigest()
 
@@ -258,7 +258,9 @@
                     self.shortNames.append(child.firstChild.data.encode("utf-8"))
             elif child_name == ELEMENT_GUID:
                 if child.firstChild is not None:
-                    self.guid = child.firstChild.data.encode("utf-8")
+                    self.guid = normalizeUUID(
+                        child.firstChild.data.encode("utf-8")
+                    )
                     if len(self.guid) < 4:
                         self.guid += "?" * (4 - len(self.guid))
             elif child_name == ELEMENT_PASSWORD:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120524/b1a1b9e0/attachment-0001.html>