[CalendarServer-changes] [4982] CalendarServer/branches/users/glyph/contacts-server-merge/ lib-patches/vobject

[source_changes at macosforge.org]

Revision: 4982
          http://trac.macosforge.org/projects/calendarserver/changeset/4982
Author:   glyph at apple.com
Date:     2010-01-29 09:54:37 -0800 (Fri, 29 Jan 2010)
Log Message:
-----------
update to decreate strictness (and include ':')

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/contacts-server-merge/lib-patches/vobject/vobject.icalendar.patch
    CalendarServer/branches/users/glyph/contacts-server-merge/lib-patches/vobject/vobject.vcard.patch

Modified: CalendarServer/branches/users/glyph/contacts-server-merge/lib-patches/vobject/vobject.icalendar.patch
===================================================================
--- CalendarServer/branches/users/glyph/contacts-server-merge/lib-patches/vobject/vobject.icalendar.patch	2010-01-29 17:53:22 UTC (rev 4981)
+++ CalendarServer/branches/users/glyph/contacts-server-merge/lib-patches/vobject/vobject.icalendar.patch	2010-01-29 17:54:37 UTC (rev 4982)
@@ -2,22 +2,21 @@
 ===================================================================
 --- vobject/icalendar.py	(revision 219)
 +++ vobject/icalendar.py	(working copy)
-@@ -1623,12 +1623,13 @@
+@@ -1622,8 +1622,12 @@
+ 
  # DQUOTE included to work around iCal's penchant for backslash escaping it,
  # although it isn't actually supposed to be escaped according to rfc2445 TEXT
- escapableCharList = '\\;,Nn"'
-+strictEscapableCharList = '\\;,Nn'
+-escapableCharList = '\\;,Nn"'
  
++# COLON included to work around Address Book's escaping it in vCard data,
++# despite the fact that it is similarly not supposed to be escaped.
++escapableCharList = '\\;:,Nn"'
++strictEscapableCharList = '\\;,Nn'
++
  def stringToTextValues(s, listSeparator=',', charList=None, strict=False):
      """Returns list of strings."""
      
-     if charList is None:
--        charList = escapableCharList
-+        charList = strictEscapableCharList
- 
-     def escapableChar (c):
-         return c in charList
-@@ -1675,9 +1676,10 @@
+@@ -1675,9 +1679,10 @@
                  else:
                      current.append(char)
              else:

Modified: CalendarServer/branches/users/glyph/contacts-server-merge/lib-patches/vobject/vobject.vcard.patch
===================================================================
--- CalendarServer/branches/users/glyph/contacts-server-merge/lib-patches/vobject/vobject.vcard.patch	2010-01-29 17:53:22 UTC (rev 4981)
+++ CalendarServer/branches/users/glyph/contacts-server-merge/lib-patches/vobject/vobject.vcard.patch	2010-01-29 17:54:37 UTC (rev 4982)
@@ -1,6 +1,6 @@
 Index: vobject/vcard.py
 ===================================================================
---- vobject/vcard.py	(revision 218)
+--- vobject/vcard.py	(revision 219)
 +++ vobject/vcard.py	(working copy)
 @@ -210,7 +210,7 @@
  def splitFields(string):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100129/83ec086c/attachment-0001.html>