Merge pull request #385 from cleder/develop

1.0.0 release candidate 1
cleder · Nov 13, 2024 · bbd4de6 · bbd4de6
2 parents 977c38a + 0a21182
commit bbd4de6
Show file tree

Hide file tree

Showing 24 changed files with 220 additions and 357 deletions.
diff --git a/README.rst b/README.rst
@@ -22,12 +22,16 @@ Geometries are handled as pygeoif_ objects.
 
 Fastkml is continually tested
 
-|test| |cov| |black| |mypy| |commit|
+|test| |hypothesis| |cov| |black| |mypy| |commit|
 
 .. |test| image:: https://github.com/cleder/fastkml/actions/workflows/run-all-tests.yml/badge.svg?branch=main
     :target: https://github.com/cleder/fastkml/actions/workflows/run-all-tests.yml
     :alt: Test
 
+.. |hypothesis| image:: https://img.shields.io/badge/hypothesis-tested-brightgreen.svg
+   :alt: Tested with Hypothesis
+   :target: https://hypothesis.readthedocs.io
+
 .. |cov| image:: https://codecov.io/gh/cleder/fastkml/branch/main/graph/badge.svg?token=VIuhPHq0ow
     :target: http://codecov.io/github/cleder/fastkml?branch=main
     :alt: codecov.io

diff --git a/fastkml/about.py b/fastkml/about.py
@@ -19,6 +19,6 @@
 The only purpose of this module is to provide a version number for the package.
 """
 
-__version__ = "1.0.0b3"
+__version__ = "1.0.0rc1"
 
 __all__ = ["__version__"]
diff --git a/fastkml/features.py b/fastkml/features.py
@@ -69,6 +69,8 @@
 from fastkml.views import LookAt
 from fastkml.views import Region
 
+__all__ = ["KmlGeometry", "NetworkLink", "Placemark", "Snippet"]
+
 logger = logging.getLogger(__name__)
 
 KmlGeometry = Union[
@@ -303,40 +305,6 @@ def __init__(
         self.extended_data = extended_data
         self.times = times
 
-    def __repr__(self) -> str:
-        """
-        Return a string representation of the _Feature object.
-
-        Returns
-        -------
-            str: String representation of the _Feature object.
-
-        """
-        return (
-            f"{self.__class__.__module__}.{self.__class__.__name__}("
-            f"ns={self.ns!r}, "
-            f"name_spaces={self.name_spaces!r}, "
-            f"id={self.id!r}, "
-            f"target_id={self.target_id!r}, "
-            f"name={self.name!r}, "
-            f"visibility={self.visibility!r}, "
-            f"isopen={self.isopen!r}, "
-            f"atom_link={self.atom_link!r}, "
-            f"atom_author={self.atom_author!r}, "
-            f"address={self.address!r}, "
-            f"phone_number={self.phone_number!r}, "
-            f"snippet={self.snippet!r}, "
-            f"description={self.description!r}, "
-            f"view={self.view!r}, "
-            f"times={self.times!r}, "
-            f"style_url={self.style_url!r}, "
-            f"styles={self.styles!r}, "
-            f"region={self.region!r}, "
-            f"extended_data={self.extended_data!r}, "
-            f"**{self._get_splat()!r},"
-            ")"
-        )
-
 
 registry.register(
     _Feature,

diff --git a/fastkml/geometry.py b/fastkml/geometry.py
@@ -359,19 +359,6 @@ def __init__(
         )
         self.altitude_mode = altitude_mode
 
-    def __repr__(self) -> str:
-        """Create a string (c)representation for _Geometry."""
-        return (
-            f"{self.__class__.__module__}.{self.__class__.__name__}("
-            f"ns={self.ns!r}, "
-            f"name_spaces={self.name_spaces!r}, "
-            f"id={self.id!r}, "
-            f"target_id={self.target_id!r}, "
-            f"altitude_mode={self.altitude_mode}, "
-            f"**{self._get_splat()!r},"
-            ")"
-        )
-
 
 class Point(_Geometry):
     """

diff --git a/fastkml/helpers.py b/fastkml/helpers.py
@@ -1100,16 +1100,15 @@ def datetime_subelement_kwarg(
         return {}
     node_text = node.text.strip() if node.text else ""
     if node_text:
-        try:
-            return {kwarg: cls.parse(node_text)}  # type: ignore[attr-defined]
-        except ValueError as exc:
-            handle_error(
-                error=exc,
-                strict=strict,
-                element=element,
-                node=node,
-                expected="DateTime",
-            )
+        if kdt := cls.parse(node_text):  # type: ignore[attr-defined]
+            return {kwarg: kdt}
+        handle_error(
+            error=ValueError(f"Invalid DateTime value: {node_text}"),
+            strict=strict,
+            element=element,
+            node=node,
+            expected="DateTime",
+        )
     return {}
 
 

diff --git a/fastkml/overlays.py b/fastkml/overlays.py
@@ -60,6 +60,15 @@
 from fastkml.views import LookAt
 from fastkml.views import Region
 
+__all__ = [
+    "GroundOverlay",
+    "ImagePyramid",
+    "KmlGeometry",
+    "LatLonBox",
+    "PhotoOverlay",
+    "ViewVolume",
+]
+
 logger = logging.getLogger(__name__)
 
 KmlGeometry = Union[
@@ -207,35 +216,6 @@ def __init__(
         self.color = clean_string(color)
         self.draw_order = draw_order
 
-    def __repr__(self) -> str:
-        """Create a string (c)representation for _Overlay."""
-        return (
-            f"{self.__class__.__module__}.{self.__class__.__name__}("
-            f"ns={self.ns!r}, "
-            f"name_spaces={self.name_spaces!r}, "
-            f"id={self.id!r}, "
-            f"target_id={self.target_id!r}, "
-            f"name={self.name!r}, "
-            f"visibility={self.visibility!r}, "
-            f"isopen={self.isopen!r}, "
-            f"atom_link={self.atom_link!r}, "
-            f"atom_author={self.atom_author!r}, "
-            f"address={self.address!r}, "
-            f"phone_number={self.phone_number!r}, "
-            f"snippet={self.snippet!r}, "
-            f"description={self.description!r}, "
-            f"view={self.view!r}, "
-            f"times={self.times!r}, "
-            f"style_url={self.style_url!r}, "
-            f"styles={self.styles!r}, "
-            f"region={self.region!r}, "
-            f"extended_data={self.extended_data!r}, "
-            f"color={self.color!r}, "
-            f"draw_order={self.draw_order!r}, "
-            f"icon={self.icon!r}, "
-            ")"
-        )
-
 
 registry.register(
     _Overlay,

diff --git a/fastkml/styles.py b/fastkml/styles.py
@@ -225,20 +225,6 @@ def __init__(
         self.color = clean_string(color)
         self.color_mode = color_mode
 
-    def __repr__(self) -> str:
-        """Create a string (c)representation for _ColorStyle."""
-        return (
-            f"{self.__class__.__module__}.{self.__class__.__name__}("
-            f"ns={self.ns!r}, "
-            f"name_spaces={self.name_spaces!r}, "
-            f"id={self.id!r}, "
-            f"target_id={self.target_id!r}, "
-            f"color={self.color!r}, "
-            f"color_mode={self.color_mode}, "
-            f"**{self._get_splat()!r},"
-            ")"
-        )
-
 
 registry.register(
     _ColorStyle,

diff --git a/fastkml/utils.py b/fastkml/utils.py
@@ -30,14 +30,14 @@ def has_attribute_values(obj: object, **kwargs: Any) -> bool:
         return False
 
 
-def find_in(
+def find_all(
     obj: object,
     *,
     of_type: Optional[Union[Type[object], Tuple[Type[object], ...]]] = None,
     **kwargs: Any,
 ) -> Generator[object, None, None]:
     """
-    Find all instances of type in the attributes of an object.
+    Find all instances of a given type with attributes matching the kwargs.
 
     Args:
     ----
@@ -50,6 +50,11 @@ def find_in(
         An iterable of all instances of the given type in the given object.
 
     """
+    if (of_type is None or isinstance(obj, of_type)) and has_attribute_values(
+        obj,
+        **kwargs,
+    ):
+        yield obj
     try:
         attrs = (attr for attr in obj.__dict__ if not attr.startswith("_"))
     except AttributeError:
@@ -63,34 +68,6 @@ def find_in(
             yield from find_all(attr, of_type=of_type, **kwargs)
 
 
-def find_all(
-    obj: object,
-    *,
-    of_type: Optional[Union[Type[object], Tuple[Type[object], ...]]] = None,
-    **kwargs: Any,
-) -> Generator[object, None, None]:
-    """
-    Find all instances of a given type with attributes matching the kwargs.
-
-    Args:
-    ----
-        obj: The object to search.
-        of_type: The type(s) to search for or None for any type.
-        **kwargs: Attributes of the object to match.
-
-    Returns:
-    -------
-        An iterable of all instances of the given type in the given object.
-
-    """
-    if (of_type is None or isinstance(obj, of_type)) and has_attribute_values(
-        obj,
-        **kwargs,
-    ):
-        yield obj
-    yield from find_in(obj, of_type=of_type, **kwargs)
-
-
 def find(
     obj: object,
     *,

diff --git a/fastkml/views.py b/fastkml/views.py
@@ -149,24 +149,6 @@ def __init__(
         self.tilt = tilt
         self.altitude_mode = altitude_mode
 
-    def __repr__(self) -> str:
-        """Create a string (c)representation for _AbstractView."""
-        return (
-            f"{self.__class__.__module__}.{self.__class__.__name__}("
-            f"ns={self.ns!r}, "
-            f"name_spaces={self.name_spaces!r}, "
-            f"id={self.id!r}, "
-            f"target_id={self.target_id!r}, "
-            f"longitude={self.longitude!r}, "
-            f"latitude={self.latitude!r}, "
-            f"altitude={self.altitude!r}, "
-            f"heading={self.heading!r}, "
-            f"tilt={self.tilt!r}, "
-            f"altitude_mode={self.altitude_mode}, "
-            f"**{self._get_splat()!r},"
-            ")"
-        )
-
 
 registry.register(
     _AbstractView,