[CalendarServer-changes] [7246] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 7246
          http://trac.macosforge.org/projects/calendarserver/changeset/7246
Author:   cdaboo at apple.com
Date:     2011-03-24 09:29:54 -0700 (Thu, 24 Mar 2011)
Log Message:
-----------
Separate out the test for \: from other bad escape sequences. Fix unicode issue in queries.

Modified Paths:
--------------
    CalendarServer/trunk/support/build.sh
    CalendarServer/trunk/twistedcaldav/query/addressbookqueryfilter.py
    CalendarServer/trunk/twistedcaldav/query/calendarqueryfilter.py

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2011-03-24 14:39:34 UTC (rev 7245)
+++ CalendarServer/trunk/support/build.sh	2011-03-24 16:29:54 UTC (rev 7246)
@@ -644,7 +644,7 @@
     "http://svn.osafoundation.org/vobject/trunk";
 
   # XXX actually PyCalendar should be imported in-place.
-  py_dependency -fe -i "src" -r 151 \
+  py_dependency -fe -i "src" -r 152 \
     "pycalendar" "pycalendar" "pycalendar" \
     "http://svn.mulberrymail.com/repos/PyCalendar/branches/server";
 

Modified: CalendarServer/trunk/twistedcaldav/query/addressbookqueryfilter.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/query/addressbookqueryfilter.py	2011-03-24 14:39:34 UTC (rev 7245)
+++ CalendarServer/trunk/twistedcaldav/query/addressbookqueryfilter.py	2011-03-24 16:29:54 UTC (rev 7246)
@@ -281,10 +281,10 @@
             # so we need to check for that and iterate over the list.
             if isinstance(value, list):
                 for subvalue in value:
-                    if _textCompare(unicode(subvalue)):
+                    if _textCompare(unicode(subvalue, "utf-8")):
                         return not self.negate
             else:
-                if _textCompare(unicode(value)):
+                if _textCompare(unicode(value, "utf-8")):
                     return not self.negate
         
         return self.negate

Modified: CalendarServer/trunk/twistedcaldav/query/calendarqueryfilter.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/query/calendarqueryfilter.py	2011-03-24 14:39:34 UTC (rev 7245)
+++ CalendarServer/trunk/twistedcaldav/query/calendarqueryfilter.py	2011-03-24 16:29:54 UTC (rev 7246)
@@ -520,11 +520,11 @@
             # so we need to check for that and iterate over the list.
             if isinstance(value, list):
                 for subvalue in value:
-                    matched, result = _textCompare(unicode(subvalue))
+                    matched, result = _textCompare(unicode(subvalue, "utf-8"))
                     if matched:
                         return result
             else:
-                matched, result = _textCompare(unicode(value))
+                matched, result = _textCompare(unicode(value, "utf-8"))
                 if matched:
                     return result
         
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110324/69603eb2/attachment-0001.html>