Merge pull request #504 from ocefpaf/fix_lints

Fix lints

Author: ocefpaf

folium/features.py

@@ -5,15 +5,17 @@
 
 Extra features Elements.
 """
-from jinja2 import Template
 import json
 
-from branca.utilities import (_parse_size,
-                              _locations_mirror, _locations_tolist, image_to_url,
-                              text_type, binary_type,
-                              none_min, none_max, iter_points,
-                              )
-from branca.element import Element, Figure, JavascriptLink, CssLink, MacroElement
+from jinja2 import Template
+from six import text_type
+
+from branca.utilities import (
+    _parse_size, _locations_mirror, _locations_tolist, image_to_url,
+    binary_type, none_min, none_max, iter_points,
+)
+from branca.element import (Element, Figure, JavascriptLink, CssLink,
+                            MacroElement)
 from branca.colormap import LinearColormap
 
 from .map import Layer, Icon, Marker, Popup, FeatureGroup
@@ -762,13 +764,14 @@ def __init__(self, bounds, color='black', weight=1, fill_color='black',
         self.fill_opacity = fill_opacity
         self._template = Template(u"""
             {% macro script(this, kwargs) %}
-            var {{this.get_name()}} = L.rectangle([[{{this.location[0]}}, {{this.location[1]}}],
-                                                   [{{this.location[2]}}, {{this.location[3]}}]],
+            var {{this.get_name()}} = L.rectangle(
+                                  [[{{this.location[0]}},{{this.location[1]}}],
+                                  [{{this.location[2]}},{{this.location[3]}}]],
                 {
-                    color:'{{ this.color }}',
-                    fillColor:'{{ this.fill_color }}',
-                    fillOpacity:{{ this.fill_opacity }},
-                    weight:{{ this.weight }}
+                    color: '{{ this.color }}',
+                    fillColor: '{{ this.fill_color }}',
+                    fillOpacity: {{ this.fill_opacity }},
+                    weight: {{ this.weight }}
                 }).addTo({{this._parent.get_name()}});
 
             {% endmacro %}
@@ -799,18 +802,21 @@ def __init__(self, locations, color='black', weight=1, fill_color='black',
         -------
         folium.features.Polygon object
 
-        Example
-        -------
-        >>> loc= [[35.6762, 139.7795],
-                  [35.6718, 139.7831],
-                  [35.6767, 139.7868],
-                  [35.6795, 139.7824],
-                  [35.6787, 139.7791]]
-            Polygon(loc, color="blue", weight=10, fill_color="red",
-                          fill_opacity=0.5, popup="Tokyo, Japan"))
+        Examples
+        --------
+        >>> loc = [[35.6762, 139.7795],
+        ...        [35.6718, 139.7831],
+        ...        [35.6767, 139.7868],
+        ...        [35.6795, 139.7824],
+        ...       [35.6787, 139.7791]]
+        >>> Polygon(loc, color="blue", weight=10, fill_color="red",
+        ...         fill_opacity=0.5, popup="Tokyo, Japan"))
+
         """
-        super(Polygon, self).__init__((_locations_mirror(locations) if not latlon else
-                                       _locations_tolist(locations)), popup=popup)
+        super(Polygon, self).__init__((
+            _locations_mirror(locations) if not latlon else
+            _locations_tolist(locations)), popup=popup
+        )
         self._name = 'Polygon'
         self.color = color
         self.weight = weight
@@ -1096,12 +1102,11 @@ class ColorLine(FeatureGroup):
         The list of segments colors.
         It must have length equal to `len(positions)-1`.
     colormap: branca.colormap.Colormap or list or tuple
-        The colormap to use.
-        If a list or tuple of colors is provided, a LinearColormap will be created
-        from it.
+        The colormap to use. If a list or tuple of colors is provided,
+        a LinearColormap will be created from it.
     nb_steps: int, default 12
-        To have lighter output, the colormap will be discretized to that number
-        of colors.
+        To have lighter output the colormap will be discretized
+        to that number of colors.
     opacity: float, default 1
         Line opacity, scale 0-1
     weight: int, default 2
@@ -1133,7 +1138,8 @@ def __init__(self, positions, colors, colormap=None, nb_steps=12,
         else:
             cm = colormap
         out = {}
-        for (lat1, lng1), (lat2, lng2), color in zip(positions[:-1], positions[1:], colors):
+        for (lat1, lng1), (lat2, lng2), color in zip(positions[:-1], positions[1:], colors):  # noqa
             out.setdefault(cm(color), []).append([[lat1, lng1], [lat2, lng2]])
         for key, val in out.items():
-            self.add_child(MultiPolyLine(val, color=key, weight=weight, opacity=opacity))
+            self.add_child(MultiPolyLine(val, color=key,
+                                         weight=weight, opacity=opacity))

requirements.txt

@@ -1,2 +1,3 @@
 Jinja2
 branca
+six

tests/test_folium.py

@@ -25,7 +25,8 @@
 import branca.element
 
 from folium.map import Popup, Marker, FitBounds, FeatureGroup
-from folium.features import GeoJson, TopoJson, PolyLine, MultiPolyLine, RectangleMarker, Polygon
+from folium.features import (GeoJson, TopoJson, PolyLine, MultiPolyLine,
+                             RectangleMarker, Polygon)
 from folium.plugins import ImageOverlay
 
 rootpath = os.path.abspath(os.path.dirname(__file__))
@@ -455,12 +456,12 @@ def test_geo_json_str(self):
 
         out = ''.join(self.map._parent.render().split())
 
-        # Verify the geo_json object
+        # Verify the geo_json object.
         obj_temp = jinja2.Template("""
             var {{ this.get_name() }} = L.geoJson({{ this.style_data() }})
                 .addTo({{ this._parent.get_name() }});
             {{ this.get_name() }}.setStyle(function(feature) {return feature.properties.style;});
-                """)
+                """)  # noqa
         obj = obj_temp.render(this=geo_json, json=json)
         assert ''.join(obj.split())[:-1] in out