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.

Signed-off-by: Kai Zhang <zhangk1985@gmail.com>

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()

setup.py

@@ -145,6 +145,6 @@ def run(self):
       },
       package_data={'cldoc': datafiles},
       cmdclass=cmdclass,
-      install_requires=['pyparsing ==1.5.7'])
+      install_requires=['pyparsing ==1.5.7', 'unittest2 == 0.8.0'])
 
 # vi:ts=4:et

tests/regression.py

@@ -5,7 +5,7 @@
 lcldoc = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 sys.path.insert(0, lcldoc)
 
-import unittest
+import unittest2
 from cldoc import cmdgenerate
 
 from cldoc import fs
@@ -15,7 +15,7 @@
 
 fs.fs = fs.Virtual
 
-class Regression(unittest.TestCase):
+class Regression(unittest2.TestCase):
     def setUp(self):
         pass
 
@@ -70,6 +70,6 @@ def generate_tests():
 generate_tests()
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest2.main()
 
 # vi:ts=4:et