[CalendarServer-changes] [6386] CalendarServer/trunk/txdav/common/datastore/sql.py

[source_changes at macosforge.org]

Revision: 6386
          http://trac.macosforge.org/projects/calendarserver/changeset/6386
Author:   cdaboo at apple.com
Date:     2010-09-29 10:01:37 -0700 (Wed, 29 Sep 2010)
Log Message:
-----------
No need to do utf-8 encodes.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/sql.py

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2010-09-29 00:18:50 UTC (rev 6385)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2010-09-29 17:01:37 UTC (rev 6386)
@@ -466,8 +466,8 @@
     def resourceNamesSinceToken(self, token, depth):
         results = [
             (
-                path.encode("utf-8") if path else (collection.encode("utf-8") if collection else ""),
-                name.encode("utf-8") if name else "",
+                path if path else (collection if collection else ""),
+                name if name else "",
                 deleted
             )
             for path, collection, name, deleted in
@@ -724,7 +724,7 @@
 
     def resourceNamesSinceToken(self, token):
         results = [
-            (name.encode("utf-8") if name else "", deleted)
+            (name if name else "", deleted)
             for name, deleted in
             self._txn.execSQL("""
                 select %(column_RESOURCE_NAME)s, %(column_DELETED)s from %(name)s
@@ -1173,7 +1173,7 @@
 
     def resourceNamesSinceToken(self, token):
         results = [
-            (name.encode("utf-8") if name else "", deleted)
+            (name if name else "", deleted)
             for name, deleted in
             self._txn.execSQL("""
                 select %(column_RESOURCE_NAME)s, %(column_DELETED)s from %(name)s
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100929/29093461/attachment.html>