Merge pull request #1567 from pmains/flake

Fixing flake8 warnings

Author: ocefpaf

folium/__init__.py

@@ -22,8 +22,8 @@
     CustomIcon,
     DivIcon,
     GeoJson,
-    GeoJsonTooltip,
     GeoJsonPopup,
+    GeoJsonTooltip,
     LatLngPopup,
     RegularPolygonMarker,
     TopoJson,
@@ -88,6 +88,7 @@
     'Figure',
     'FitBounds',
     'GeoJson',
+    'GeoJsonPopup',
     'GeoJsonTooltip',
     'Html',
     'IFrame',

folium/elements.py

@@ -1,4 +1,4 @@
-from branca.element import Figure, Element, JavascriptLink, CssLink
+from branca.element import CssLink, Element, Figure, JavascriptLink
 
 
 class JSCSSMixin(Element):

folium/features.py

@@ -3,28 +3,28 @@
 
 """
 
-import json
-import warnings
 import functools
+import json
 import operator
+import warnings
 
 from branca.colormap import LinearColormap, StepColormap
 from branca.element import (Element, Figure, JavascriptLink, MacroElement)
 from branca.utilities import color_brewer
 
 from folium.elements import JSCSSMixin
 from folium.folium import Map
-from folium.map import (FeatureGroup, Icon, Layer, Marker, Tooltip, Popup)
+from folium.map import (FeatureGroup, Icon, Layer, Marker, Popup, Tooltip)
 from folium.utilities import (
-    validate_locations,
     _parse_size,
+    camelize,
     get_bounds,
+    get_obj_in_upper_tree,
     image_to_url,
     none_max,
     none_min,
-    get_obj_in_upper_tree,
     parse_options,
-    camelize
+    validate_locations,
 )
 from folium.vector_layers import Circle, CircleMarker, PolyLine, path_options
 
@@ -583,16 +583,16 @@ def find_identifier(self):
         """
         feats = self.data['features']
         # Each feature has an 'id' field with a unique value.
-        unique_ids = set(feat.get('id', None) for feat in feats)
+        unique_ids = {feat.get('id', None) for feat in feats}
         if None not in unique_ids and len(unique_ids) == len(feats):
             return 'feature.id'
         # Each feature has a unique string or int property.
         if all(isinstance(feat.get('properties', None), dict) for feat in feats):
             for key in feats[0]['properties']:
-                unique_values = set(
+                unique_values = {
                     feat['properties'].get(key, None) for feat in feats
                     if isinstance(feat['properties'].get(key, None), (str, int))
-                )
+                }
                 if len(unique_values) == len(feats):
                     return 'feature.properties.{}'.format(key)
         # We add an 'id' field with a unique value to the data.

folium/folium.py

@@ -13,9 +13,9 @@
 from folium.raster_layers import TileLayer
 from folium.utilities import (
     _parse_size,
+    parse_options,
     temp_html_filepath,
     validate_location,
-    parse_options,
 )
 
 from jinja2 import Environment, PackageLoader, Template

folium/map.py

@@ -3,13 +3,12 @@
 
 """
 
-from collections import OrderedDict
-
 import warnings
+from collections import OrderedDict
 
 from branca.element import Element, Figure, Html, MacroElement
 
-from folium.utilities import validate_location, camelize, parse_options
+from folium.utilities import camelize, parse_options, validate_location
 
 from jinja2 import Template
 
@@ -305,6 +304,7 @@ def render(self):
             raise ValueError("{} location must be assigned when added directly to map.".format(self._name))
         super(Marker, self).render()
 
+
 class Popup(Element):
     """Create a Popup instance that can be linked to a Layer.
 

folium/plugins/__init__.py

@@ -7,7 +7,6 @@
 """
 
 from folium.plugins.antpath import AntPath
-from folium.plugins.polyline_offset import PolyLineOffset
 from folium.plugins.beautify_icon import BeautifyIcon
 from folium.plugins.boat_marker import BoatMarker
 from folium.plugins.draw import Draw
@@ -25,6 +24,7 @@
 from folium.plugins.minimap import MiniMap
 from folium.plugins.mouse_position import MousePosition
 from folium.plugins.pattern import CirclePattern, StripePattern
+from folium.plugins.polyline_offset import PolyLineOffset
 from folium.plugins.polyline_text_path import PolyLineTextPath
 from folium.plugins.scroll_zoom_toggler import ScrollZoomToggler
 from folium.plugins.search import Search

folium/plugins/antpath.py

@@ -1,5 +1,5 @@
 from folium.elements import JSCSSMixin
-from folium.vector_layers import path_options, BaseMultiLocation
+from folium.vector_layers import BaseMultiLocation, path_options
 
 from jinja2 import Template
 

folium/plugins/dual_map.py

@@ -1,4 +1,4 @@
-from branca.element import MacroElement, Figure
+from branca.element import Figure, MacroElement
 
 from folium.elements import JSCSSMixin
 from folium.folium import Map

folium/plugins/heat_map.py

@@ -3,10 +3,10 @@
 from folium.elements import JSCSSMixin
 from folium.map import Layer
 from folium.utilities import (
+    if_pandas_df_convert_to_numpy,
     none_max,
     none_min,
     parse_options,
-    if_pandas_df_convert_to_numpy,
     validate_location,
 )
 

folium/plugins/marker_cluster.py

@@ -1,6 +1,6 @@
 from folium.elements import JSCSSMixin
 from folium.map import Layer, Marker
-from folium.utilities import validate_locations, parse_options
+from folium.utilities import parse_options, validate_locations
 
 from jinja2 import Template
 

folium/plugins/time_slider_choropleth.py

@@ -150,7 +150,7 @@ def __init__(self, data, styledict, name=None, overlay=True, control=True,
         timestamps = set()
         for feature in styledict.values():
             timestamps.update(set(feature.keys()))
-        timestamps = sorted(list(timestamps))
+        timestamps = sorted(timestamps)
 
         self.timestamps = timestamps
         self.styledict = styledict

folium/plugins/timestamped_geo_json.py

@@ -4,7 +4,7 @@
 
 from folium.elements import JSCSSMixin
 from folium.folium import Map
-from folium.utilities import parse_options, get_bounds
+from folium.utilities import get_bounds, parse_options
 
 from jinja2 import Template
 

folium/plugins/vectorgrid_protobuf.py

@@ -1,6 +1,6 @@
-
 from folium.elements import JSCSSMixin
 from folium.map import Layer
+
 from jinja2 import Template
 
 

folium/utilities.py

@@ -1,17 +1,18 @@
 import base64
+import collections
+import copy
 import io
 import json
 import math
 import os
 import struct
 import tempfile
+import uuid
 import zlib
 from contextlib import contextmanager
-import copy
-import uuid
-import collections
 from urllib.parse import urlparse, uses_netloc, uses_params, uses_relative
 
+
 import numpy as np
 try:
     import pandas as pd

folium/vector_layers.py

@@ -6,7 +6,7 @@
 from branca.element import MacroElement
 
 from folium.map import Marker, Popup, Tooltip
-from folium.utilities import validate_locations, get_bounds
+from folium.utilities import get_bounds, validate_locations
 
 from jinja2 import Template