Revision: 2109 http://trac.macosforge.org/projects/calendarserver/changeset/2109 Author: wsanchez@apple.com Date: 2008-01-11 14:00:19 -0800 (Fri, 11 Jan 2008) Log Message: ----------- Pull up r2101, import log Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch =================================================================== --- CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch 2008-01-11 21:59:04 UTC (rev 2108) +++ CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch 2008-01-11 22:00:19 UTC (rev 2109) @@ -2,7 +2,7 @@ =================================================================== --- twisted/web2/dav/xattrprops.py (revision 19773) +++ twisted/web2/dav/xattrprops.py (working copy) -@@ -33,6 +33,11 @@ +@@ -33,12 +33,18 @@ import urllib import sys @@ -14,7 +14,14 @@ import xattr -@@ -66,16 +71,8 @@ + if getattr(xattr, 'xattr', None) is None: + raise ImportError("wrong xattr package imported") + ++from twisted.python import log + from twisted.web2 import responsecode + from twisted.web2.http import HTTPError, StatusResponse + from twisted.web2.dav import davxml +@@ -66,16 +72,8 @@ deadPropertyXattrPrefix = "user." def _encode(clazz, name): @@ -33,7 +40,7 @@ return r def _decode(clazz, name): -@@ -97,19 +94,41 @@ +@@ -97,19 +95,41 @@ def get(self, qname): try: