Rename to xml_subelement_list_kwarg in fastkml.helpers

cleder · Dec 22, 2023 · 05aa17f · 05aa17f
1 parent 0981d68
commit 05aa17f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 39 deletions.
diff --git a/fastkml/containers.py b/fastkml/containers.py
@@ -37,7 +37,7 @@
 from fastkml.geometry import Point
 from fastkml.geometry import Polygon
 from fastkml.helpers import xml_subelement_list
-from fastkml.helpers import xml_subelement_list_kwarg_iterable
+from fastkml.helpers import xml_subelement_list_kwarg
 from fastkml.styles import Style
 from fastkml.styles import StyleMap
 from fastkml.styles import StyleUrl
@@ -157,7 +157,7 @@ def _get_kwargs(
         name_spaces = kwargs["name_spaces"]
         assert name_spaces is not None
         kwargs.update(
-            xml_subelement_list_kwarg_iterable(
+            xml_subelement_list_kwarg(
                 element=element,
                 ns=ns,
                 name_spaces=name_spaces,
@@ -270,7 +270,7 @@ def _get_kwargs(
         name_spaces = kwargs["name_spaces"]
         assert name_spaces is not None
         kwargs.update(
-            xml_subelement_list_kwarg_iterable(
+            xml_subelement_list_kwarg(
                 element=element,
                 ns=ns,
                 name_spaces=name_spaces,

diff --git a/fastkml/data.py b/fastkml/data.py
@@ -36,7 +36,7 @@
 from fastkml.helpers import subelement_text_kwarg
 from fastkml.helpers import text_subelement
 from fastkml.helpers import xml_subelement_list
-from fastkml.helpers import xml_subelement_list_kwarg_iterable
+from fastkml.helpers import xml_subelement_list_kwarg
 from fastkml.types import Element
 
 __all__ = [
@@ -411,7 +411,7 @@ def _get_kwargs(
         name_spaces = kwargs["name_spaces"]
         assert name_spaces is not None
         kwargs.update(
-            xml_subelement_list_kwarg_iterable(
+            xml_subelement_list_kwarg(
                 element=element,
                 ns=ns,
                 name_spaces=name_spaces,

diff --git a/fastkml/features.py b/fastkml/features.py
@@ -51,7 +51,7 @@
 from fastkml.helpers import xml_subelement
 from fastkml.helpers import xml_subelement_kwarg
 from fastkml.helpers import xml_subelement_list
-from fastkml.helpers import xml_subelement_list_kwarg_iterable
+from fastkml.helpers import xml_subelement_list_kwarg
 from fastkml.links import Link
 from fastkml.mixins import TimeMixin
 from fastkml.styles import Style
@@ -391,7 +391,7 @@ def _get_kwargs(
         name_spaces = kwargs["name_spaces"]
         assert name_spaces is not None
         kwargs.update(
-            xml_subelement_list_kwarg_iterable(
+            xml_subelement_list_kwarg(
                 element=element,
                 ns=ns,
                 name_spaces=name_spaces,

diff --git a/fastkml/gx.py b/fastkml/gx.py
@@ -97,7 +97,7 @@
 from fastkml.helpers import bool_subelement
 from fastkml.helpers import subelement_bool_kwarg
 from fastkml.helpers import xml_subelement_list
-from fastkml.helpers import xml_subelement_list_kwarg_iterable
+from fastkml.helpers import xml_subelement_list_kwarg
 from fastkml.types import Element
 
 __all__ = [
@@ -395,7 +395,7 @@ def _get_kwargs(
             ),
         )
         kwargs.update(
-            xml_subelement_list_kwarg_iterable(
+            xml_subelement_list_kwarg(
                 element=element,
                 ns=name_spaces["gx"],
                 name_spaces=name_spaces,

diff --git a/fastkml/helpers.py b/fastkml/helpers.py
@@ -262,31 +262,6 @@ def xml_subelement_kwarg(
 
 
 def xml_subelement_list_kwarg(
-    *,
-    element: Element,
-    ns: str,
-    name_spaces: Dict[str, str],
-    kwarg: str,
-    obj_class: Type[_XMLObject],
-    strict: bool,
-) -> Dict[str, List[_XMLObject]]:
-    if subelements := element.findall(f"{ns}{obj_class.get_tag_name()}"):
-        return {
-            kwarg: [
-                obj_class.class_from_element(
-                    ns=ns,
-                    name_spaces=name_spaces,
-                    element=subelement,
-                    strict=strict,
-                )
-                for subelement in subelements
-            ],
-        }
-    else:
-        return {}
-
-
-def xml_subelement_list_kwarg_iterable(
     *,
     element: Element,
     ns: str,

diff --git a/fastkml/kml.py b/fastkml/kml.py
@@ -40,7 +40,7 @@
 from fastkml.enums import Verbosity
 from fastkml.features import Placemark
 from fastkml.helpers import xml_subelement_list
-from fastkml.helpers import xml_subelement_list_kwarg_iterable
+from fastkml.helpers import xml_subelement_list_kwarg
 from fastkml.overlays import GroundOverlay
 from fastkml.overlays import PhotoOverlay
 from fastkml.types import Element
@@ -128,7 +128,7 @@ def _get_kwargs(
         assert name_spaces is not None
         kwargs["features"] = []
         kwargs.update(
-            xml_subelement_list_kwarg_iterable(
+            xml_subelement_list_kwarg(
                 element=element,
                 ns=ns,
                 name_spaces=name_spaces,

diff --git a/fastkml/styles.py b/fastkml/styles.py
@@ -47,7 +47,7 @@
 from fastkml.helpers import xml_subelement
 from fastkml.helpers import xml_subelement_kwarg
 from fastkml.helpers import xml_subelement_list
-from fastkml.helpers import xml_subelement_list_kwarg_iterable
+from fastkml.helpers import xml_subelement_list_kwarg
 from fastkml.types import Element
 
 logger = logging.getLogger(__name__)
@@ -1004,7 +1004,7 @@ def _get_kwargs(
         assert name_spaces is not None
 
         kwargs.update(
-            xml_subelement_list_kwarg_iterable(
+            xml_subelement_list_kwarg(
                 element=element,
                 ns=ns,
                 name_spaces=name_spaces,
@@ -1196,7 +1196,7 @@ def _get_kwargs(
         name_spaces = kwargs["name_spaces"]
         assert name_spaces is not None
         kwargs.update(
-            xml_subelement_list_kwarg_iterable(
+            xml_subelement_list_kwarg(
                 element=element,
                 ns=ns,
                 name_spaces=name_spaces,