Merge pull request #122 from ajdavis/CDRIVER-572-man2mallard

Make man2mallard.py Python 3-compatible.

Author: ajdavis

doc/mallard2man.py

@@ -31,12 +31,9 @@
 import os
 import sys
 
-try:
-    import codecs
-    from datetime import datetime
-    from lxml import etree
-except ImportError:
-    sys.exit(0)
+import codecs
+from datetime import datetime
+from xml.etree import ElementTree
 
 INCLUDE = '{http://www.w3.org/2001/XInclude}include'
 TITLE = '{http://projectmallard.org/1.0/}title'
@@ -73,10 +70,22 @@ def __init__(self, inFile, outFile, section):
         self.sections = []
 
     def _parse(self):
-        self.tree = etree.ElementTree()
-        self.tree.parse(file(self.inFile))
+        self.tree = ElementTree.ElementTree()
+        self.tree.parse(open(self.inFile))
         self.root = self.tree.getroot()
 
+        # Python's standard ElementTree doesn't store an element's parent on
+        # the element. Make a child->parent map.
+        try:
+            iterator = self.tree.iter()
+        except AttributeError:
+            # Python 2.6.
+            iterator = self.tree.getiterator()
+        self.parent_map = dict((c, p) for p in iterator for c in p)
+
+    def _get_parent(self, ele):
+        return self.parent_map[ele]
+
     def _extract(self):
         # Try to extract the title.
         for child in self.root.getchildren():
@@ -152,7 +161,7 @@ def _generateSynopsis(self, synopsis):
         self._writeCommand('.fi')
 
     def _generateCode(self, code):
-        if code.getparent().tag == P:
+        if self._get_parent(code).tag == P:
             self._writeCommand('.B %s' % code.text)
         else:
             self._writeCommand('.nf')
@@ -240,7 +249,7 @@ def _generateElement(self, ele):
             d = codecs.open(f, 'r', encoding='utf-8').read()
             self._writeLine(d)
         else:
-            print 'unknown element type', ele
+            print('unknown element type %s' % ele)
 
     def _generateTable(self, table):
         for child in table.getchildren():
@@ -297,7 +306,7 @@ def main(filenames, section='3'):
 
 if __name__ == '__main__':
     if len(sys.argv) < 3:
-        print 'usage: %s SECTION FILENAMES...' % sys.argv[0]
+        print('usage: %s SECTION FILENAMES...' % sys.argv[0])
         sys.exit(1)
     section = sys.argv[1]
     main(sys.argv[2:], section)