Skip to content

Commit 603b9ec

Browse files
authored
Merge pull request #674 from ocefpaf/absolute_imports
absolute imports
2 parents 30ca3e4 + 649dbcb commit 603b9ec

4 files changed

Lines changed: 20 additions & 20 deletions

File tree

folium/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
from branca.element import (CssLink, Div, Element, Figure, Html, IFrame,
55
JavascriptLink, Link, MacroElement)
66

7-
from ._version import get_versions
7+
from folium._version import get_versions
88

9-
from .features import (
9+
from folium.features import (
1010
CircleMarker, ClickForMarker, CustomIcon, DivIcon, GeoJson, LatLngPopup,
1111
MarkerCluster, PolyLine, RegularPolygonMarker, TopoJson, Vega, VegaLite, WmsTileLayer,
1212
)
1313

14-
from .folium import Map
14+
from folium.folium import Map
1515

16-
from .map import (
16+
from folium.map import (
1717
FeatureGroup, FitBounds, Icon, LayerControl, Marker, Popup, TileLayer
1818
)
1919

folium/features.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from six import binary_type, text_type
2121

22-
from .map import FeatureGroup, Icon, Layer, Marker, Popup
22+
from folium.map import FeatureGroup, Icon, Layer, Marker, Popup
2323

2424

2525
class WmsTileLayer(Layer):

folium/folium.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
import requests
1515

16-
from .features import GeoJson, TopoJson
17-
from .map import FitBounds, LegacyMap
16+
from folium.features import GeoJson, TopoJson
17+
from folium.map import FitBounds, LegacyMap
1818

1919

2020
class Map(LegacyMap):

folium/plugins/__init__.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77

88
from __future__ import (absolute_import, division, print_function)
99

10-
from .boat_marker import BoatMarker
11-
from .fast_marker_cluster import FastMarkerCluster
12-
from .float_image import FloatImage
13-
from .fullscreen import Fullscreen
14-
from .heat_map import HeatMap
15-
from .image_overlay import ImageOverlay
16-
from .marker_cluster import MarkerCluster
17-
from .measure_control import MeasureControl
18-
from .polyline_text_path import PolyLineTextPath
19-
from .scroll_zoom_toggler import ScrollZoomToggler
20-
from .terminator import Terminator
21-
from .timestamped_geo_json import TimestampedGeoJson
22-
from .timestamped_wmstilelayer import TimestampedWmsTileLayers
10+
from folium.plugins.boat_marker import BoatMarker
11+
from folium.plugins.fast_marker_cluster import FastMarkerCluster
12+
from folium.plugins.float_image import FloatImage
13+
from folium.plugins.fullscreen import Fullscreen
14+
from folium.plugins.heat_map import HeatMap
15+
from folium.plugins.image_overlay import ImageOverlay
16+
from folium.plugins.marker_cluster import MarkerCluster
17+
from folium.plugins.measure_control import MeasureControl
18+
from folium.plugins.polyline_text_path import PolyLineTextPath
19+
from folium.plugins.scroll_zoom_toggler import ScrollZoomToggler
20+
from folium.plugins.terminator import Terminator
21+
from folium.plugins.timestamped_geo_json import TimestampedGeoJson
22+
from folium.plugins.timestamped_wmstilelayer import TimestampedWmsTileLayers
2323

2424
__all__ = [
2525
'BoatMarker',

0 commit comments

Comments
 (0)