From 96fedd6a4092b92f92eaef42a30841229233f01f Mon Sep 17 00:00:00 2001
From: Frank <33519926+Conengmo@users.noreply.github.com>
Date: Sat, 24 Dec 2022 16:46:45 +0100
Subject: [PATCH] combine optional and union

---
 folium/features.py | 12 ++++++------
 folium/map.py      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/folium/features.py b/folium/features.py
index 2f312b9e8..80ce6a185 100644
--- a/folium/features.py
+++ b/folium/features.py
@@ -87,8 +87,8 @@ def __init__(
         number_of_sides: int = 4,
         rotation: int = 0,
         radius: int = 15,
-        popup: Optional[Union[str, Popup]] = None,
-        tooltip: Optional[Union[str, Tooltip]] = None,
+        popup: Union[Popup, str, None] = None,
+        tooltip: Union[Tooltip, str, None] = None,
         **kwargs: TypePathOptions,
     ):
         super().__init__(location, popup=popup, tooltip=tooltip)
@@ -143,8 +143,8 @@ class Vega(JSCSSMixin, Element):
     def __init__(
         self,
         data: Any,
-        width: Optional[Union[int, str]] = None,
-        height: Optional[Union[int, str]] = None,
+        width: Union[int, str, None] = None,
+        height: Union[int, str, None] = None,
         left: Union[int, str] = "0%",
         top: Union[int, str] = "0%",
         position: str = "relative",
@@ -260,8 +260,8 @@ class VegaLite(Element):
     def __init__(
         self,
         data: Any,
-        width: Optional[Union[int, str]] = None,
-        height: Optional[Union[int, str]] = None,
+        width: Union[int, str, None] = None,
+        height: Union[int, str, None] = None,
         left: Union[int, str] = "0%",
         top: Union[int, str] = "0%",
         position: str = "relative",
diff --git a/folium/map.py b/folium/map.py
index 18a620a6b..aa86a45a5 100644
--- a/folium/map.py
+++ b/folium/map.py
@@ -336,8 +336,8 @@ class Marker(MacroElement):
     def __init__(
         self,
         location: Optional[Sequence[float]] = None,
-        popup: Optional[Union[str, "Popup"]] = None,
-        tooltip: Optional[Union[str, "Tooltip"]] = None,
+        popup: Union["Popup", str, None] = None,
+        tooltip: Union["Tooltip", str, None] = None,
         icon: Optional[Icon] = None,
         draggable: bool = False,
         **kwargs: TypeJsonValue,