Removed lxml from dependencies

Switched usages to standard lib to reduce dependencies

Author: DavidWhittingham

arcpyext/_patches/metadata/Metadata.py

@@ -5,11 +5,10 @@
 """
 import collections.abc
 import re
+import xml.etree.ElementTree as ET
 
 import arcpy
 
-from lxml import etree as ET
-
 from ...TopicCategory import TopicCategory
 
 TOPIC_CATEGORIES_DISPLAY_NAME_TO_ENUM = {e.display_name.lower(): e for e in TopicCategory}
@@ -47,13 +46,13 @@ def topicCategories_getter(self):
             raise NotImplementedError("Metadata object currently has none or empty XML.")
 
         metadata_xml_tree = ET.ElementTree(ET.fromstring(metadata_xml))
-        topic_categories_xpath = "/metadata[@xml:lang=\"en\"]/dataIdInfo/tpCat/TopicCatCd"
+        topic_categories_xpath = "./dataIdInfo/tpCat/TopicCatCd"
 
         # get a list of topic elements
-        topic_category_elements = metadata_xml_tree.xpath(topic_categories_xpath)
+        topic_category_elements = metadata_xml_tree.findall(topic_categories_xpath)
 
         if not topic_category_elements:
-            # no elmeents found, return empty list
+            # no elements found, return empty list
             return []
 
         # convert each element value to a str
@@ -68,7 +67,7 @@ def topicCategories_setter(self, value):
 
         # process value into elements
         if isinstance(value, str):
-            # presume we were supplied a one or more topic categorie as a string, delimited
+            # presume we were supplied a one or more topic categories as a string, delimited
             value = [s.strip() for s in re.split(",|;", value)]
         elif isinstance(value, TopicCategory):
             # a single enumerated type has been given, put in a list
@@ -80,20 +79,20 @@ def topicCategories_setter(self, value):
         elif not isinstance(value, collections.abc.Sequence):
             raise ValueError("Input 'topicCategories' value is not valid.")
 
-        # value is now a sequence presumeably of either an enumerated type already, or a string representing the
+        # value is now a sequence presumably of either an enumerated type already, or a string representing the
         # display name, the ISO name, or portal name.
         # attempt to resolve each sequence value to an enum and then create element
         value = [ET.Element("TopicCatCd", value=_str_to_topic_category(v).value) for v in value]
 
         # set elements in XML
-        topic_categories_parent_xpath = "/metadata[@xml:lang=\"en\"]/dataIdInfo/tpCat"
+        topic_categories_parent_xpath = "./dataIdInfo/tpCat"
         metadata_xml_tree = ET.ElementTree(ET.fromstring(metadata_xml))
-        topic_category_parent_element = next(iter(metadata_xml_tree.xpath(topic_categories_parent_xpath)), None)
+        topic_category_parent_element = next(iter(metadata_xml_tree.findall(topic_categories_parent_xpath)), None)
         topic_category_parent_element.clear()
         topic_category_parent_element.extend(value)
 
         # save XML back to arcpy
-        self.xml = ET.tostring(metadata_xml_tree.getroot(), encoding="utf-8", pretty_print=False)
+        self.xml = "<?xml version=\"1.0\"?>{}".format(ET.tostring(metadata_xml_tree.getroot(), encoding="unicode"))
 
     topicCategories_prop = property(topicCategories_getter, topicCategories_setter)
 

arcpyext/_version.py

@@ -1,3 +1,3 @@
-__version__ = "0.7.32"
+__version__ = "0.7.33"
 __author__ = "David Whittingham; David Payne; Adam Kerz; Peter Reyne; Daniel Baternik; Chris Blanchfield; Gary Bagnall"
 __copyright__ = "Copyright (C) 2013-2024 David Whittingham"

arcpyext/toolbox/PythonToolbox.py

@@ -14,7 +14,7 @@
 
 import arcpy
 
-from lxml import etree as ET
+import xml.etree.ElementTree as ET
 
 
 class PythonToolbox(object):
@@ -61,9 +61,9 @@ def load_xml(self):
             t.load_xml()
 
     def save_definitions(self):
-        #with open(self.xml_path,'w') as fout:
-        #    self.xml_tree.write(fout,encoding = 'utf-8')
-        self.xml_tree.write(self.xml_path, encoding='utf-8')
+        with open(self.xml_path, 'wb') as fout:
+            self.xml_tree.write(fout, encoding='utf-8', xml_declaration=True)
+
         # and save tools too
         for t in self.tools:
             t.save_definitions()
@@ -104,7 +104,7 @@ def load_xml(self):
 
     def save_definitions(self):
         with open(self.xml_path, 'wb') as fout:
-            self.xml_tree.write(fout, encoding='utf-8')
+            self.xml_tree.write(fout, encoding='utf-8', xml_declaration=True)
 
     def set_description_in_xml(self, description):
         e = PythonToolbox.get_or_create_element(self.xml_tree.getroot(), 'dataIdInfo')
@@ -121,4 +121,4 @@ def set_parameter_description_in_xml(self, param_name, description):
     def set_summary_in_xml(self, summary):
         e = PythonToolbox.get_or_create_element(self.xml_tree.getroot(), 'tool', attributes={'name': self.tool_name})
         e = PythonToolbox.get_or_create_element(e, 'summary')
-        e.text = summary
+        e.text = summary

requirements.txt

@@ -1,10 +1,10 @@
 aenum>=3.1.11,<4
 future>=0.18.2
-lxml>=4.3.2,<5
-olefile==0.46 ; python_version<'3.4'
+olefile==0.47 ; python_version<'3.4'
 pathlib2>=2.3.4,<3
 pythonnet>=2.4.0,<3 ; python_version<'3'
 pythonnet>=3.0.0,<4 ; python_version>='3'
 sqlparse>=0.3.1,<0.4 ; python_version<'3'
 sqlparse>=0.4.4,<0.5 ; python_version>='3'
-XlsxWriter>=2.0.0,<3
+XlsxWriter>=2,<3 ; python_version<'3'
+XlsxWriter>=3,<4 ; python_version>='3'