[CalendarServer-changes] [4964] CalendarServer/branches/release/CalendarServer-2.4-dev/lib-patches/ Twisted/twisted.python.filepath.patch

source_changes at macosforge.org source_changes at macosforge.org
Tue Jan 26 10:26:54 PST 2010


Revision: 4964
          http://trac.macosforge.org/projects/calendarserver/changeset/4964
Author:   glyph at apple.com
Date:     2010-01-26 10:26:52 -0800 (Tue, 26 Jan 2010)
Log Message:
-----------
Deal with filesystem encoding in FilePath.child, to allow for non-ASCII characters in DataRoot and DocumentRoot despite unicode type leakage in some circumstances.

Added Paths:
-----------
    CalendarServer/branches/release/CalendarServer-2.4-dev/lib-patches/Twisted/twisted.python.filepath.patch

Added: CalendarServer/branches/release/CalendarServer-2.4-dev/lib-patches/Twisted/twisted.python.filepath.patch
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.4-dev/lib-patches/Twisted/twisted.python.filepath.patch	                        (rev 0)
+++ CalendarServer/branches/release/CalendarServer-2.4-dev/lib-patches/Twisted/twisted.python.filepath.patch	2010-01-26 18:26:52 UTC (rev 4964)
@@ -0,0 +1,13 @@
+Index: twisted/python/filepath.py
+===================================================================
+--- twisted/python/filepath.py	(revision 26969)
++++ twisted/python/filepath.py	(working copy)
+@@ -337,6 +337,8 @@
+         return d
+ 
+     def child(self, path):
++        if isinstance(path, unicode):
++            path = path.encode('utf-8')
+         if platform.isWindows() and path.count(":"):
+             # Catch paths like C:blah that don't have a slash
+             raise InsecurePath("%r contains a colon." % (path,))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100126/27f19ccd/attachment.html>


More information about the calendarserver-changes mailing list