compatible with python-2.6

Fixes two issues in generators/xml.py when using python-2.6.

The main problem is caused by incompatible between xml.etree.ElementTree-1.2
(used by pyhton-2.6) and xml.etree.ElementTree-1.3 (used by python-2.7).

+ ElementTree.register_namespace(prefix, uri)
  Workaround by:
  ElementTree._namespace_map[uri] = prefix

  This solution is based on http://goo.gl/Z4Sjtq

+ ElementTree.write(file, encoding='utf-8', xml_declaration=True)
  Workaround by:
  ElementTree.write(file, encoding='UTF-8')

  This solution is based on http://goo.gl/8K88ow (pls check Olli's answer)

Also replaces unittest by unittest2 which is compitable with python-2.6 and
fixes the tests.

Signed-off-by: Kai Zhang <[email protected]>

Author: kylezh

cldoc/generators/xml.py

@@ -33,8 +33,12 @@ def generate(self, outdir):
         except OSError:
             pass
 
-        ElementTree.register_namespace('gobject', 'http://jessevdk.github.com/cldoc/gobject/1.0')
-        ElementTree.register_namespace('cldoc', 'http://jessevdk.github.com/cldoc/1.0')
+        if ElementTree.VERSION[0:3] == '1.2':
+            ElementTree._namespace_map['http://jessevdk.github.com/cldoc/gobject/1.0'] = 'gobject'
+            ElementTree._namespace_map['http://jessevdk.github.com/cldoc/1.0'] = 'cldoc'
+        else:
+            ElementTree.register_namespace('gobject', 'http://jessevdk.github.com/cldoc/gobject/1.0')
+            ElementTree.register_namespace('cldoc', 'http://jessevdk.github.com/cldoc/1.0')
 
         self.index = ElementTree.Element('index')
         self.written = {}
@@ -110,7 +114,10 @@ def write_xml(self, elem, fname):
         self.indent(tree.getroot())
 
         f = fs.fs.open(os.path.join(self.outdir, fname), 'w')
-        tree.write(f, encoding='utf-8', xml_declaration=True)
+        if ElementTree.VERSION[0:3] == '1.2':
+            tree.write(f, encoding='UTF-8')
+        else:
+            tree.write(f, encoding='UTF-8', xml_declaration=True)
         f.write('\n')
 
         f.close()

tests/output/abstract-A.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <class id="A" interface="true" name="A" xmlns="http://jessevdk.github.com/cldoc/1.0">
   <method abstract="yes" id="A::f" name="f" virtual="yes">
     <brief>A function of A.</brief>

tests/output/abstract-index.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <index xmlns="http://jessevdk.github.com/cldoc/1.0">
   <class name="A" ref="A#A" />
 </index>

tests/output/base-A.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <class id="A" name="A" xmlns="http://jessevdk.github.com/cldoc/1.0">
   <doc>
 The class A.

tests/output/base-Base.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <class id="Base" interface="true" name="Base" xmlns="http://jessevdk.github.com/cldoc/1.0">
   <subclass access="public" name="A" ref="A#A" />
   <method abstract="yes" id="Base::b" name="b" virtual="yes">

tests/output/base-index.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <index xmlns="http://jessevdk.github.com/cldoc/1.0">
   <class name="A" ref="A#A" />
   <class name="Base" ref="Base#Base" />

tests/output/class-A.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <class id="A" name="A" xmlns="http://jessevdk.github.com/cldoc/1.0">
   <doc>
 The class A.

tests/output/class-index.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <index xmlns="http://jessevdk.github.com/cldoc/1.0">
   <class name="A" ref="A#A" />
 </index>

tests/output/constructor-A.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <class id="A" name="A" xmlns="http://jessevdk.github.com/cldoc/1.0">
   <constructor id="A::A" name="A">
     <brief>Constructor.</brief>

tests/output/constructor-index.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <index xmlns="http://jessevdk.github.com/cldoc/1.0">
   <class name="A" ref="A#A" />
 </index>