From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Fri, 5 Aug 2011 14:29:01 +0000 (+0000)
Subject: the python XML module Element Tree name-space has been changed and didn't include... 
X-Git-Tag: live~161
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/bde10170193f23b0936d609e7a05e6f3785472e2

the python XML module Element Tree name-space has been changed and didn't include the fixtag function, which resulted the XML data export tool in the OSQA administration not to work. We try to import it and on Import Error we define the function manually

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1156 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum_modules/exporter/exporter.py b/forum_modules/exporter/exporter.py
index 87dca42..c673429 100644
--- a/forum_modules/exporter/exporter.py
+++ b/forum_modules/exporter/exporter.py
@@ -9,10 +9,35 @@ from forum.settings import APP_URL
 from forum.templatetags.extra_tags import diff_date
 import xml.etree.ElementTree
 from xml.etree import ElementTree as ET
-from xml.etree.ElementTree import Comment, _encode, ProcessingInstruction, QName, fixtag, _escape_attrib, _escape_cdata
+from xml.etree.ElementTree import Comment, _encode, ProcessingInstruction, QName, _escape_attrib, _escape_cdata, _namespace_map
 from forum import settings
 from django.conf import settings as djsettings
 import settings as selfsettings
+import string
+
+try:
+	from xml.etree.ElementTree import fixtag
+except ImportError:
+	def fixtag(tag, namespaces):
+		# given a decorated tag (of the form {uri}tag), return prefixed
+		# tag and namespace declaration, if any
+		if isinstance(tag, QName):
+			tag = tag.text
+		namespace_uri, tag = string.split(tag[1:], "}", 1)
+		prefix = namespaces.get(namespace_uri)
+		if prefix is None:
+			prefix = _namespace_map.get(namespace_uri)
+			if prefix is None:
+				prefix = "ns%d" % len(namespaces)
+			namespaces[namespace_uri] = prefix
+			if prefix == "xml":
+				xmlns = None
+			else:
+				xmlns = ("xmlns:%s" % prefix, namespace_uri)
+		else:
+			xmlns = None
+		return "%s:%s" % (prefix, tag), xmlns
+
 
 CACHE_KEY = "%s_exporter_state" % APP_URL
 EXPORT_STEPS = []