[CalendarServer-changes] [1609] CalDAVTester/trunk/src
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jun 19 13:08:27 PDT 2007
Revision: 1609
http://trac.macosforge.org/projects/calendarserver/changeset/1609
Author: cdaboo at apple.com
Date: 2007-06-19 13:08:26 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Fixes for unicode character handling in tests.
Modified Paths:
--------------
CalDAVTester/trunk/src/caldavtest.py
CalDAVTester/trunk/src/request.py
CalDAVTester/trunk/src/serverinfo.py
Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py 2007-06-18 20:43:15 UTC (rev 1608)
+++ CalDAVTester/trunk/src/caldavtest.py 2007-06-19 20:08:26 UTC (rev 1609)
@@ -466,7 +466,7 @@
result = False
resulttxt += "\nProperty %s was not extracted from multistatus response\n" % (req.grabproperty[0],)
else:
- self.manager.server_info.addextrasubs({req.grabproperty[1]: propvalue})
+ self.manager.server_info.addextrasubs({req.grabproperty[1]: propvalue.encode("utf-8")})
return result, resulttxt, response, respdata
Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py 2007-06-18 20:43:15 UTC (rev 1608)
+++ CalDAVTester/trunk/src/request.py 2007-06-19 20:08:26 UTC (rev 1609)
@@ -107,18 +107,18 @@
def parseXML( self, node ):
self.auth = node.getAttribute( src.xmlDefs.ATTR_AUTH ) != src.xmlDefs.ATTR_VALUE_NO
- self.user = self.manager.server_info.subs(node.getAttribute( src.xmlDefs.ATTR_USER ))
- self.pswd = self.manager.server_info.subs(node.getAttribute( src.xmlDefs.ATTR_PSWD ))
+ self.user = self.manager.server_info.subs(node.getAttribute( src.xmlDefs.ATTR_USER ).encode("utf-8"))
+ self.pswd = self.manager.server_info.subs(node.getAttribute( src.xmlDefs.ATTR_PSWD ).encode("utf-8"))
self.end_delete = node.getAttribute( src.xmlDefs.ATTR_END_DELETE ) == src.xmlDefs.ATTR_VALUE_YES
self.print_response = node.getAttribute( src.xmlDefs.ATTR_PRINT_RESPONSE ) == src.xmlDefs.ATTR_VALUE_YES
for child in node._get_childNodes():
if child._get_localName() == src.xmlDefs.ELEMENT_METHOD:
- self.method = child.firstChild.data
+ self.method = child.firstChild.data.encode("utf-8")
elif child._get_localName() == src.xmlDefs.ELEMENT_HEADER:
self.parseHeader(child)
elif child._get_localName() == src.xmlDefs.ELEMENT_RURI:
- self.ruri = self.manager.server_info.subs(child.firstChild.data)
+ self.ruri = self.manager.server_info.subs(child.firstChild.data.encode("utf-8"))
elif child._get_localName() == src.xmlDefs.ELEMENT_DATA:
self.data = data()
self.datasubs = self.data.parseXML( child )
@@ -136,9 +136,9 @@
value = None
for child in node._get_childNodes():
if child._get_localName() == src.xmlDefs.ELEMENT_NAME:
- name = child.firstChild.data
+ name = child.firstChild.data.encode("utf-8")
elif child._get_localName() == src.xmlDefs.ELEMENT_VALUE:
- value = self.manager.server_info.subs(child.firstChild.data)
+ value = self.manager.server_info.subs(child.firstChild.data.encode("utf-8"))
if (name is not None) and (value is not None):
self.headers[name] = value
@@ -160,9 +160,9 @@
variable = None
for child in node._get_childNodes():
if child._get_localName() == src.xmlDefs.ELEMENT_PROPERTY:
- property = child.firstChild.data
+ property = child.firstChild.data.encode("utf-8")
elif child._get_localName() == src.xmlDefs.ELEMENT_VARIABLE:
- variable = self.manager.server_info.subs(child.firstChild.data)
+ variable = self.manager.server_info.subs(child.firstChild.data.encode("utf-8"))
if (property is not None) and (variable is not None):
self.grabproperty = (property, variable)
@@ -184,9 +184,9 @@
for child in node._get_childNodes():
if child._get_localName() == src.xmlDefs.ELEMENT_CONTENTTYPE:
- self.content_type = child.firstChild.data
+ self.content_type = child.firstChild.data.encode("utf-8")
elif child._get_localName() == src.xmlDefs.ELEMENT_FILEPATH:
- self.filepath = child.firstChild.data
+ self.filepath = child.firstChild.data.encode("utf-8")
return subs
@@ -227,7 +227,7 @@
for child in node._get_childNodes():
if child._get_localName() == src.xmlDefs.ELEMENT_CALLBACK:
- self.callback = child.firstChild.data
+ self.callback = child.firstChild.data.encode("utf-8")
elif child._get_localName() == src.xmlDefs.ELEMENT_ARG:
self.parseArgXML(child)
@@ -236,10 +236,10 @@
values = []
for child in node._get_childNodes():
if child._get_localName() == src.xmlDefs.ELEMENT_NAME:
- name = child.firstChild.data
+ name = child.firstChild.data.encode("utf-8")
elif child._get_localName() == src.xmlDefs.ELEMENT_VALUE:
if child.firstChild is not None:
- values.append(self.manager.server_info.subs(child.firstChild.data))
+ values.append(self.manager.server_info.subs(child.firstChild.data.encode("utf-8")))
else:
values.append("")
if name and len(values):
Modified: CalDAVTester/trunk/src/serverinfo.py
===================================================================
--- CalDAVTester/trunk/src/serverinfo.py 2007-06-18 20:43:15 UTC (rev 1608)
+++ CalDAVTester/trunk/src/serverinfo.py 2007-06-19 20:08:26 UTC (rev 1609)
@@ -70,14 +70,14 @@
def parseXML( self, node ):
for child in node._get_childNodes():
if child._get_localName() == src.xmlDefs.ELEMENT_HOST:
- self.host = child.firstChild.data
+ self.host = child.firstChild.data.encode("utf-8")
elif child._get_localName() == src.xmlDefs.ELEMENT_PORT:
self.port = int( child.firstChild.data )
elif child._get_localName() == src.xmlDefs.ELEMENT_SSL:
self.ssl = True
elif child._get_localName() == src.xmlDefs.ELEMENT_SERVERFILEPATH:
if child.firstChild is not None:
- self.serverfilepath = child.firstChild.data
+ self.serverfilepath = child.firstChild.data.encode("utf-8")
elif child._get_localName() == src.xmlDefs.ELEMENT_SUBSTITUTIONS:
self.parseSubstitutionsXML(child)
@@ -102,8 +102,8 @@
value = None
for schild in child._get_childNodes():
if schild._get_localName() == src.xmlDefs.ELEMENT_KEY:
- key = schild.firstChild.data
+ key = schild.firstChild.data.encode("utf-8")
elif schild._get_localName() == src.xmlDefs.ELEMENT_VALUE:
- value = schild.firstChild.data
+ value = schild.firstChild.data.encode("utf-8")
if key and value:
self.subsdict[key] = value
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070619/611d87b8/attachment.html
More information about the calendarserver-changes
mailing list