Don't crash if given an XML fragment.

James William Pye · James William Pye · commit 60cf1da17295 · 2009-03-12T15:24:06.000-07:00
Rather, make it a document and return all the children as a list.
diff --git a/postgresql/protocol/typio.py b/postgresql/protocol/typio.py
@@ -48,11 +48,6 @@
 from decimal import Decimal, DecimalTuple
 import datetime
 
-try:
-	import xml.etree.cElementTree as etree
-except ImportError:
-	import xml.etree.ElementTree as etree
-
 from .. import types as pg_types
 from ..encodings import aliases as pg_enc_aliases
 from . import typstruct as ts
@@ -676,7 +671,12 @@ def xml_pack(self, xml):
 		return self._encode(etree.tostring(xml))[0]
 
 	def xml_unpack(self, xmldata):
-		return pg_types.etree.XML(self._decode(xmldata)[0])
+		xml_or_frag = self._decode(xmldata)[0]
+		try:
+			return pg_types.etree.XML(xml_or_frag)
+		except Exception:
+			# try it again, but return the children.
+			return list(pg_types.etree.XML('<x>' + xml_or_frag + '</x>'))
 
 	def attribute_map(self, pq_descriptor):
 		return {
diff --git a/postgresql/types.py b/postgresql/types.py
@@ -6,6 +6,10 @@
 PostgreSQL types and identifiers
 """
 import math
+try:
+	import xml.etree.cElementTree as etree
+except ImportError:
+	import xml.etree.ElementTree as etree
 
 InvalidOid = 0
 
