Skip to content

Commit b859e1b

Browse files
committed
combine optional and union
1 parent 2d07a7d commit b859e1b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

folium/features.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ def __init__(
8787
number_of_sides: int = 4,
8888
rotation: int = 0,
8989
radius: int = 15,
90-
popup: Optional[Union[str, Popup]] = None,
91-
tooltip: Optional[Union[str, Tooltip]] = None,
90+
popup: Union[Popup, str, None] = None,
91+
tooltip: Union[Tooltip, str, None] = None,
9292
**kwargs: TypePathOptions,
9393
):
9494
super().__init__(location, popup=popup, tooltip=tooltip)
@@ -143,8 +143,8 @@ class Vega(JSCSSMixin, Element):
143143
def __init__(
144144
self,
145145
data: Any,
146-
width: Optional[Union[int, str]] = None,
147-
height: Optional[Union[int, str]] = None,
146+
width: Union[int, str, None] = None,
147+
height: Union[int, str, None] = None,
148148
left: Union[int, str] = "0%",
149149
top: Union[int, str] = "0%",
150150
position: str = "relative",
@@ -260,8 +260,8 @@ class VegaLite(Element):
260260
def __init__(
261261
self,
262262
data: Any,
263-
width: Optional[Union[int, str]] = None,
264-
height: Optional[Union[int, str]] = None,
263+
width: Union[int, str, None] = None,
264+
height: Union[int, str, None] = None,
265265
left: Union[int, str] = "0%",
266266
top: Union[int, str] = "0%",
267267
position: str = "relative",

folium/map.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ class Marker(MacroElement):
336336
def __init__(
337337
self,
338338
location: Optional[Sequence[float]] = None,
339-
popup: Optional[Union[str, "Popup"]] = None,
340-
tooltip: Optional[Union[str, "Tooltip"]] = None,
339+
popup: Union["Popup", str, None] = None,
340+
tooltip: Union["Tooltip", str, None] = None,
341341
icon: Optional[Icon] = None,
342342
draggable: bool = False,
343343
**kwargs: TypeJsonValue,

0 commit comments

Comments
 (0)