merge of '434dee0cc13fa6e16a52014e292f0e769e821680'

and 'b0d1ff8b21014633e8ebd6118da1ad59a9349dcb'

Monotone-Parent: 434dee0cc13fa6e16a52014e292f0e769e821680
Monotone-Parent: b0d1ff8b21014633e8ebd6118da1ad59a9349dcb
Monotone-Revision: fdc69a8bf5b6b5a68b37d7ddf77d671fc0bcbe15

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-04-22T14:50:01
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-04-22 14:50:01 +00:00
2 changed files with 10 additions and 0 deletions
+6
View File
@@ -1,3 +1,9 @@
2010-04-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Tests/Integration/webdavlib.py
(_WD_XMLTreeElement.appendSubtree): added handling of unicode
subtrees
2010-04-22 Francis Lachapelle <flachapelle@inverse.ca>
* Tests/Unit/TestiCalRecurrenceCalculator.m: new test module for
+4
View File
@@ -441,6 +441,7 @@ class _WD_XMLNS_MGR:
class _WD_XMLTreeElement:
typeNum = type(0)
typeStr = type("")
typeUnicode = type(u"")
typeList = type([])
typeDict = type({})
@@ -457,6 +458,9 @@ class _WD_XMLTreeElement:
strValue = "%d" % subtree
textNode = _WD_XMLTreeTextNode(strValue)
self.append(textNode)
elif type(subtree) == self.typeUnicode:
textNode = _WD_XMLTreeTextNode(subtree.encode("utf-8"))
self.append(textNode)
elif type(subtree) == self.typeStr:
textNode = _WD_XMLTreeTextNode(subtree)
self.append(textNode)