Skip to content

Commit f329d81

Browse files
committed
ruff check
1 parent f006bfa commit f329d81

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

folium/features.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
import numpy as np
1313
import requests
1414
from branca.colormap import ColorMap, LinearColormap, StepColormap
15-
from branca.element import Element, Figure, Html, IFrame, JavascriptLink, MacroElement, Div
15+
from branca.element import Div, Element, Figure, Html, IFrame, JavascriptLink, MacroElement
1616
from branca.utilities import color_brewer
1717

1818
from folium.elements import JSCSSMixin
1919
from folium.folium import Map
2020
from folium.map import FeatureGroup, Icon, Layer, Marker, Popup, Tooltip
2121
from folium.template import Template
2222
from folium.utilities import (
23+
TypeBoundsReturn,
24+
TypeContainer,
2325
TypeJsonValue,
2426
TypeLine,
2527
TypePathOptions,
@@ -32,7 +34,7 @@
3234
none_max,
3335
none_min,
3436
remove_empty,
35-
validate_locations, TypeBoundsReturn, TypeContainer,
37+
validate_locations,
3638
)
3739
from folium.vector_layers import Circle, CircleMarker, PolyLine, path_options
3840

folium/map.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import warnings
77
from collections import OrderedDict
8-
from typing import TYPE_CHECKING, List, Optional, Sequence, Union, cast
8+
from typing import TYPE_CHECKING, Optional, Sequence, Union, cast
99

1010
from branca.element import Element, Figure, Html, MacroElement
1111

@@ -14,11 +14,12 @@
1414
from folium.utilities import (
1515
JsCode,
1616
TypeBounds,
17+
TypeBoundsReturn,
1718
TypeJsonValue,
1819
escape_backticks,
1920
parse_options,
2021
remove_empty,
21-
validate_location, TypeBoundsReturn,
22+
validate_location,
2223
)
2324

2425
if TYPE_CHECKING:

folium/raster_layers.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
"""
55

6-
from typing import Any, Callable, Optional, Union, cast
6+
from typing import Any, Callable, Optional, Union
77

88
import xyzservices
99
from branca.element import Element, Figure
@@ -12,11 +12,13 @@
1212
from folium.template import Template
1313
from folium.utilities import (
1414
TypeBounds,
15+
TypeBoundsReturn,
1516
TypeJsonValue,
1617
image_to_url,
1718
mercator_transform,
19+
normalize_bounds_type,
1820
parse_options,
19-
remove_empty, TypeBoundsReturn, normalize_bounds_type,
21+
remove_empty,
2022
)
2123

2224

folium/utilities.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
from urllib.parse import urlparse, uses_netloc, uses_params, uses_relative
2525

2626
import numpy as np
27-
from folium import Popup
28-
29-
from branca.element import Element, Figure, Div
27+
from branca.element import Div, Element, Figure
3028

3129
# import here for backwards compatibility
3230
from branca.utilities import ( # noqa F401
@@ -37,6 +35,8 @@
3735
write_png,
3836
)
3937

38+
from folium import Popup
39+
4040
try:
4141
import pandas as pd
4242
except ImportError:

tests/test_utilities.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
get_obj_in_upper_tree,
1313
if_pandas_df_convert_to_numpy,
1414
javascript_identifier_path_to_array_notation,
15+
normalize_bounds_type,
1516
parse_font_size,
1617
parse_options,
1718
validate_location,
1819
validate_locations,
19-
validate_multi_locations, normalize_bounds_type,
20+
validate_multi_locations,
2021
)
2122

2223

0 commit comments

Comments
 (0)