[CalendarServer-changes] [8075] CalendarServer/branches/users/glyph/other-html/twistedcaldav/ extensions.py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Sep 13 12:10:02 PDT 2011
Revision: 8075
http://trac.macosforge.org/projects/calendarserver/changeset/8075
Author: glyph at apple.com
Date: 2011-09-13 12:10:02 -0700 (Tue, 13 Sep 2011)
Log Message:
-----------
correct handling of None.
Modified Paths:
--------------
CalendarServer/branches/users/glyph/other-html/twistedcaldav/extensions.py
Modified: CalendarServer/branches/users/glyph/other-html/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/branches/users/glyph/other-html/twistedcaldav/extensions.py 2011-09-13 19:09:55 UTC (rev 8074)
+++ CalendarServer/branches/users/glyph/other-html/twistedcaldav/extensions.py 2011-09-13 19:10:02 UTC (rev 8075)
@@ -30,7 +30,6 @@
]
import urllib
-import cgi
import time
from itertools import cycle
@@ -517,7 +516,6 @@
whenPropertiesListed = self.resource.listProperties(request)
@whenPropertiesListed.addCallback
def gotProperties(qnames):
- noneValue = object()
accessDeniedValue = object()
def gotError(f, name):
@@ -534,7 +532,8 @@
whenAllProperties = gatherResults([
maybeDeferred(self.resource.readProperty, qn, request)
- .addCallback(lambda p: (p.sname(), p.toxml()))
+ .addCallback(lambda p, iqn=qn: (p.sname(), p.toxml())
+ if p is not None else ("{%s}%s" % iqn, None) )
.addErrback(gotError, "{%s}%s" % qn)
for qn in sorted(qnames)
])
@@ -543,17 +542,9 @@
def gotValues(items):
for even, [name, value] in zip(cycle(["even", "odd"]), items):
if value is None:
- # An AssertionError might be appropriate, but
- # we may as well continue rendering.
- log.err("Unexpected None value for property: %s" %
- (name,))
- continue
- elif value is noneValue:
value = tags.i("(no value)")
elif value is accessDeniedValue:
value = tags.i("(access forbidden)")
- else:
- value = cgi.escape(value)
yield tag.clone().fillSlots(
even=even, name=name, value=value,
)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110913/8fd9731e/attachment.html>
More information about the calendarserver-changes
mailing list