[CalendarServer-changes] [5156] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5156
          http://trac.macosforge.org/projects/calendarserver/changeset/5156
Author:   sagen at apple.com
Date:     2010-02-19 21:58:41 -0800 (Fri, 19 Feb 2010)
Log Message:
-----------
Don't allow backslash escaping of double-quote in vobject

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch
    CalendarServer/trunk/support/patchmaker

Modified: CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch
===================================================================
--- CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch	2010-02-19 16:40:58 UTC (rev 5155)
+++ CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch	2010-02-20 05:58:41 UTC (rev 5156)
@@ -2,7 +2,7 @@
 ===================================================================
 --- vobject/icalendar.py	(revision 219)
 +++ vobject/icalendar.py	(working copy)
-@@ -1622,8 +1622,12 @@
+@@ -1622,11 +1622,19 @@
  
  # 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
@@ -10,13 +10,21 @@
  
 +# 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'
 +
++# Isn't it a bad idea to be lenient with \" ?
++if True:
++    escapableCharList = '\\;,Nn'
++else:
++    escapableCharList = '\\;:,Nn"'
++
  def stringToTextValues(s, listSeparator=',', charList=None, strict=False):
      """Returns list of strings."""
-     
-@@ -1675,9 +1679,10 @@
+-    
++
+     if charList is None:
+         charList = escapableCharList
+ 
+@@ -1675,9 +1683,10 @@
                  else:
                      current.append(char)
              else:

Modified: CalendarServer/trunk/support/patchmaker
===================================================================
--- CalendarServer/trunk/support/patchmaker	2010-02-19 16:40:58 UTC (rev 5155)
+++ CalendarServer/trunk/support/patchmaker	2010-02-20 05:58:41 UTC (rev 5156)
@@ -24,7 +24,7 @@
 #
 
 #projects = ("Twisted", "vobject", "dateutil", "xattr")
-projects = ("Twisted", "vobject",)
+projects = ("vobject",)
 cwd = os.getcwd()
 libpatches = os.path.join(cwd, "lib-patches")
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100219/2bcba65d/attachment.html>