Fixes for "rst2odf_prepstyles" module.

Apply [patch:#427] by Dmitry Shachnev:

Open output (zip)file in binary mode.

Use standard `xml.etree` module instead of 3rd party `lxml`.

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@9365 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 19 insertions, 8 deletions

diff --git a/docutils/tools/rst2odt_prepstyles.py b/docutils/tools/rst2odt_prepstyles.py
index 640383e30..6944a3d61 100755
--- a/docutils/tools/rst2odt_prepstyles.py
+++ b/docutils/tools/rst2odt_prepstyles.py
@@ -13,7 +13,8 @@ See https://docutils.sourceforge.io/docs/user/odt.html#page-size
 
 # Author: Michael Schutte <michi@uiae.at>
 
-from lxml import etree
+from xml.etree import ElementTree as etree
+
 import sys
 import zipfile
 from tempfile import mkstemp
@@ -29,17 +30,27 @@ NAMESPACES = {
 def prepstyle(filename):
 
     zin = zipfile.ZipFile(filename)
-    styles = zin.read("styles.xml")
-
-    root = etree.fromstring(styles)
-    for el in root.xpath("//style:page-layout-properties",
-                         namespaces=NAMESPACES):
-        for attr in el.attrib:
+    styles = zin.open("styles.xml")
+
+    root = None
+    # some extra effort to preserve namespace prefixes
+    for event, elem in etree.iterparse(styles, events=("start", "start-ns")):
+        if event == "start-ns":
+            etree.register_namespace(elem[0], elem[1])
+        elif event == "start":
+            if root is None:
+                root = elem
+
+    styles.close()
+
+    for el in root.findall(".//style:page-layout-properties",
+                           namespaces=NAMESPACES):
+        for attr in list(el.attrib):
             if attr.startswith("{%s}" % NAMESPACES["fo"]):
                 del el.attrib[attr]
 
     tempname = mkstemp()
-    zout = zipfile.ZipFile(os.fdopen(tempname[0], "w"), "w",
+    zout = zipfile.ZipFile(os.fdopen(tempname[0], "wb"), "w",
                            zipfile.ZIP_DEFLATED)
 
     for item in zin.infolist():