Hopefully a real fix for the XML type.

James William Pye · James William Pye · commit 01ea8921e820 · 2010-09-03T10:27:31.000-07:00
This is getting a bit tricky..
diff --git a/postgresql/test/test_driver.py b/postgresql/test/test_driver.py
@@ -1141,7 +1141,13 @@ def testXML(self):
 			return
 		foo = etree.XML('<foo/>')
 		bar = etree.XML('<bar/>')
-		tostr = etree.tostring
+		if hasattr(etree, 'tostringlist'):
+			# 3.2
+			def tostr(x):
+				return etree.tostring(x, encoding='utf-8')
+		else:
+			# 3.1 compat
+			tostr = etree.tostring
 		self.failUnlessEqual(tostr(xml.first(foo)), tostr(foo))
 		self.failUnlessEqual(tostr(xml.first(bar)), tostr(bar))
 		self.failUnlessEqual(tostr(textxml.first('<foo/>')), tostr(foo))
diff --git a/postgresql/types/io/stdlib_xml_etree.py b/postgresql/types/io/stdlib_xml_etree.py
@@ -43,30 +43,40 @@ def xml_io_factory(typoid, typio, c = compose):
 else:
 	# New etree tostring API.
 	def xml_pack(xml, encoding,
-		tostr = etree.tostringlist, et = etree.ElementTree,
+		tostr = etree.tostring, et = etree.ElementTree,
 		str = str, isinstance = isinstance, tuple = tuple,
 	):
+		if isinstance(xml, bytes):
+			return xml
 		if isinstance(xml, str):
 			# If it's a string, encode and return.
 			return xml.encode(encoding)
 		elif isinstance(xml, tuple):
 			# If it's a tuple, encode and return the joined items.
 			# We do not accept lists here--emphasizing lists being used for ARRAY
 			# bounds.
-			return b''.join((
+			##
+			# 3.2
+			# XXX: tostring doesn't include declaration with utf-8?
+			x = b''.join(
 				x.encode(encoding) if isinstance(x, str) else
-				b''.join(tostr(x, encoding = encoding)[1:]) for x in xml
-			))
-		return b''.join(tostr(xml, encoding = encoding)[1:])
+				tostr(x, encoding = "utf-8")
+				for x in xml
+			)
+		else:
+			##
+			# 3.2
+			# XXX: tostring doesn't include declaration with utf-8?
+			x = tostr(xml, encoding = "utf-8")
+		if encoding in ('utf8','utf-8'):
+			return x
+		else:
+			return x.decode('utf-8').encode(encoding)
 
 	def xml_io_factory(typoid, typio, c = compose):
-		def local_xml_pack(x, typio = typio):
+		def local_xml_pack(x, typio = typio, xml_pack = xml_pack):
 			return xml_pack(x, typio.encoding)
-		return (
-			local_xml_pack,
-			c((typio.decode, xml_unpack)),
-			etree.ElementTree,
-		)
+		return (local_xml_pack, c((typio.decode, xml_unpack)), etree.ElementTree,)
 
 oid_to_io = {
 	XMLOID : xml_io_factory
