Menu
▾
▴
[Docutils-checkins] SF.net SVN: docutils:[10027] trunk/docutils
|
From: <aa-...@us...> - 2025-03-08 01:31:42
|
Revision: 10027
http://sourceforge.net/p/docutils/code/10027
Author: aa-turner
Date: 2025-03-08 01:31:27 +0000 (Sat, 08 Mar 2025)
Log Message:
-----------
Resolve Ruff lint warnings
Use the ``ET`` import alias for ``xml.etree.ElementTree``.
Modified Paths:
--------------
trunk/docutils/docutils/writers/odf_odt/__init__.py
trunk/docutils/docutils/writers/odf_odt/prepstyles.py
trunk/docutils/test/test_writers/test_odt.py
Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py 2025-03-08 01:26:07 UTC (rev 10026)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py 2025-03-08 01:31:27 UTC (rev 10027)
@@ -26,7 +26,7 @@
import time
import urllib
import weakref
-from xml.etree import ElementTree as etree
+from xml.etree import ElementTree as ET
from xml.dom import minidom
import zipfile
@@ -65,10 +65,10 @@
# that support for the ability to get the parent of an element.
#
_parents = weakref.WeakKeyDictionary()
-if isinstance(etree.Element, type):
- _ElementInterface = etree.Element
+if isinstance(ET.Element, type):
+ _ElementInterface = ET.Element
else:
- _ElementInterface = etree._ElementInterface
+ _ElementInterface = ET._ElementInterface
class _ElementInterfaceWrapper(_ElementInterface):
@@ -570,7 +570,7 @@
updated, new_dom_styles, updated_node = self.update_stylesheet(
self.visitor.get_dom_stylesheet(), language_code, region_code)
if updated:
- s1 = etree.tostring(new_dom_styles)
+ s1 = ET.tostring(new_dom_styles)
self.write_zip_str(zfile, 'styles.xml', s1)
self.store_embedded_files(zfile)
self.copy_from_stylesheet(zfile)
@@ -696,7 +696,7 @@
attrib=MANIFEST_NAMESPACE_ATTRIB,
nsdict=MANIFEST_NAMESPACE_DICT,
)
- doc = etree.ElementTree(root)
+ doc = ET.ElementTree(root)
SubElement(root, 'manifest:file-entry', attrib={
'manifest:media-type': self.MIME_TYPE,
'manifest:full-path': '/',
@@ -727,7 +727,7 @@
attrib=META_NAMESPACE_ATTRIB,
nsdict=META_NAMESPACE_DICT,
)
- doc = etree.ElementTree(root)
+ doc = ET.ElementTree(root)
root = SubElement(root, 'office:meta', nsdict=METNSD)
el1 = SubElement(root, 'meta:generator', nsdict=METNSD)
el1.text = 'Docutils/rst2odf.py/%s' % (VERSION, )
@@ -861,7 +861,7 @@
'office:document-content',
attrib=CONTENT_NAMESPACE_ATTRIB,
)
- self.content_tree = etree.ElementTree(element=root)
+ self.content_tree = ET.ElementTree(element=root)
self.current_element = root
SubElement(root, 'office:scripts')
SubElement(root, 'office:font-face-decls')
@@ -940,16 +940,16 @@
'.xml file' % (stylespath, extension))
self.str_stylesheet = s1
self.str_stylesheetcontent = s2
- self.dom_stylesheet = etree.fromstring(self.str_stylesheet)
+ self.dom_stylesheet = ET.fromstring(self.str_stylesheet)
if not s2:
return
# TODO: dom_stylesheetcontent is never used. Remove?
- self.dom_stylesheetcontent = etree.fromstring(
+ self.dom_stylesheetcontent = ET.fromstring(
self.str_stylesheetcontent)
self.table_styles = self.extract_table_styles(s2)
def extract_table_styles(self, styles_str):
- root = etree.fromstring(styles_str)
+ root = ET.fromstring(styles_str)
table_styles = {}
auto_styles = root.find(
'{%s}automatic-styles' % (CNSD['office'], ))
@@ -1051,7 +1051,7 @@
or self.settings.custom_header
or self.settings.custom_footer):
self.add_header_footer(self.dom_stylesheet)
- return etree.tostring(self.dom_stylesheet)
+ return ET.tostring(self.dom_stylesheet)
def get_dom_stylesheet(self):
return self.dom_stylesheet
@@ -1434,7 +1434,7 @@
def astext(self):
root = self.content_tree.getroot()
- et = etree.ElementTree(root)
+ et = ET.ElementTree(root)
return ToString(et)
def content_astext(self):
@@ -2632,7 +2632,7 @@
lines1.extend((my_lines_str2, '</wrappertag1>'))
s1 = ''.join(lines1)
s1 = s1.encode("utf-8")
- el1 = etree.fromstring(s1)
+ el1 = ET.fromstring(s1)
for child in el1:
self.current_element.append(child)
@@ -2854,7 +2854,7 @@
for k, v in list(CONTENT_NAMESPACE_ATTRIB.items()))
contentstr = '<stuff %s>%s</stuff>' % (attrstr, rawstr, )
contentstr = contentstr.encode("utf-8")
- content = etree.fromstring(contentstr)
+ content = ET.fromstring(contentstr)
if len(content) > 0:
el1 = content[0]
if self.in_header:
Modified: trunk/docutils/docutils/writers/odf_odt/prepstyles.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/prepstyles.py 2025-03-08 01:26:07 UTC (rev 10026)
+++ trunk/docutils/docutils/writers/odf_odt/prepstyles.py 2025-03-08 01:31:27 UTC (rev 10027)
@@ -13,7 +13,7 @@
# Author: Michael Schutte <mi...@ui...>
-from xml.etree import ElementTree as etree
+from xml.etree import ElementTree as ET
import sys
import zipfile
@@ -34,9 +34,9 @@
root = None
# some extra effort to preserve namespace prefixes
- for event, elem in etree.iterparse(styles, events=("start", "start-ns")):
+ for event, elem in ET.iterparse(styles, events=("start", "start-ns")):
if event == "start-ns":
- etree.register_namespace(elem[0], elem[1])
+ ET.register_namespace(elem[0], elem[1])
elif event == "start":
if root is None:
root = elem
@@ -55,7 +55,7 @@
for item in zin.infolist():
if item.filename == "styles.xml":
- zout.writestr(item, etree.tostring(root, encoding="UTF-8"))
+ zout.writestr(item, ET.tostring(root, encoding="UTF-8"))
else:
zout.writestr(item, zin.read(item.filename))
Modified: trunk/docutils/test/test_writers/test_odt.py
===================================================================
--- trunk/docutils/test/test_writers/test_odt.py 2025-03-08 01:26:07 UTC (rev 10026)
+++ trunk/docutils/test/test_writers/test_odt.py 2025-03-08 01:31:27 UTC (rev 10027)
@@ -35,7 +35,7 @@
import os
import sys
import unittest
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
import zipfile
if __name__ == '__main__':
@@ -113,10 +113,10 @@
payloadfile.seek(0)
zfile = zipfile.ZipFile(payloadfile, 'r')
content1 = zfile.read(filename)
- doc = etree.fromstring(content1)
+ doc = ET.fromstring(content1)
self.reorder_attributes(doc)
# return doc.toprettyxml(indent=' ')
- return etree.tostring(doc)
+ return ET.tostring(doc)
#
# Unit test methods
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
