Fix warnings.

Author: matsuken92

folium/folium.py

@@ -18,7 +18,7 @@
 
 from .map import LegacyMap, Icon, Marker, Popup, FitBounds
 from .features import (WmsTileLayer, RegularPolygonMarker, Vega, GeoJson,
-                       CircleMarker, RectangleMarker, Polygon, LatLngPopup,
+                       CircleMarker, LatLngPopup,
                        ClickForMarker, TopoJson, PolyLine, MultiPolyLine,
                        )
 

tests/test_folium.py

@@ -238,56 +238,56 @@ def test_circle_marker(self):
         bounds = self.map.get_bounds()
         assert bounds == [[45.6, -122.9], [45.7, -122.8]], bounds
 
-
     def test_rectangle_marker(self):
         """Test rectangle marker additions."""
 
         self.map = folium.Map(location=[45.60, -122.8])
         rect_templ = self.env.get_template('rectangle_marker.js')
 
         # Single Rectangle marker.
-        self.map.add_child(folium.RectangleMarker(bounds=[45.60, -122.8, 45.61, -122.7], popup='Hi'))
+        bounds=[45.60, -122.8, 45.61, -122.7]
+        self.map.add_child(folium.RectangleMarker(bounds=bounds, popup='Hi'))
         marker = list(self.map._children.values())[-1]
         rect_1 = rect_templ.render({'RectangleMarker': marker.get_name(),
-                                      'location': [45.60, -122.8,45.61, -122.7],
-                                      'color': 'black',
-                                      'fill_color': 'black',
-                                      'fill_opacity': 0.6,
-                                      'weight': 1})
+                                    'location': [45.60, -122.8, 45.61, -122.7],
+                                    'color': 'black',
+                                    'fill_color': 'black',
+                                    'fill_opacity': 0.6,
+                                    'weight': 1})
         assert (''.join(rect_1.split())[:-1] in
                 ''.join(self.map.get_root().render().split()))
 
         # Second Rectangle marker.
-        self.map.add_child(folium.RectangleMarker(bounds=[45.70, -122.9, 45.75, -122.5], popup='Hi'))
+        bounds=[45.70, -122.9, 45.75, -122.5]
+        self.map.add_child(folium.RectangleMarker(bounds=bounds, popup='Hi'))
         marker = list(self.map._children.values())[-1]
         rect_2 = rect_templ.render({'RectangleMarker': marker.get_name(),
-                                      'location': [45.70, -122.9,45.75, -122.5],
-                                      'color': 'black',
-                                      'fill_color': 'black',
-                                      'fill_opacity': 0.6,
-                                      'weight': 1})
+                                    'location': [45.70, -122.9, 45.75, -122.5],
+                                    'color': 'black',
+                                    'fill_color': 'black',
+                                    'fill_opacity': 0.6,
+                                    'weight': 1})
         assert (''.join(rect_2.split())[:-1] in
                 ''.join(self.map.get_root().render().split()))
 
         bounds = self.map.get_bounds()
         assert bounds == [[45.6, -122.9], [45.7, -122.8]], bounds
 
-
     def test_polygon(self):
         """Test polygon additions."""
 
         self.map = folium.Map(location=[45.60, -122.8])
         polygon_templ = self.env.get_template('polygon.js')
 
         # Single Polygon.
-        locations=[[35.6636, 139.7634],
-                   [35.6629, 139.7664],
-                   [35.6663, 139.7706],
-                   [35.6725, 139.7632],
-                   [35.6728, 139.7627],
-                   [35.6720, 139.7606],
-                   [35.6682, 139.7588],
-                   [35.6663, 139.7627]]
+        locations = [[35.6636, 139.7634],
+                     [35.6629, 139.7664],
+                     [35.6663, 139.7706],
+                     [35.6725, 139.7632],
+                     [35.6728, 139.7627],
+                     [35.6720, 139.7606],
+                     [35.6682, 139.7588],
+                     [35.6663, 139.7627]]
         self.map.add_child(folium.Polygon(locations=locations, popup='Hi'))
         marker = list(self.map._children.values())[-1]
         polygon_1 = polygon_templ.render({'Polygon': marker.get_name(),
@@ -300,28 +300,30 @@ def test_polygon(self):
                 ''.join(self.map.get_root().render().split()))
 
         # Second Polygon.
-        locations=[[35.5636, 138.7634],
-                   [35.5629, 138.7664],
-                   [35.5663, 138.7706],
-                   [35.5725, 138.7632],
-                   [35.5728, 138.7627],
-                   [35.5720, 138.7606],
-                   [35.5682, 138.7588],
-                   [35.5663, 138.7627]]
-        self.map.add_child(folium.Polygon(locations=locations, color='red', fill_color='red',
-                                          fill_opacity=0.7, weight=3, popup='Hi'))
+        locations = [[35.5636, 138.7634],
+                     [35.5629, 138.7664],
+                     [35.5663, 138.7706],
+                     [35.5725, 138.7632],
+                     [35.5728, 138.7627],
+                     [35.5720, 138.7606],
+                     [35.5682, 138.7588],
+                     [35.5663, 138.7627]]
+        self.map.add_child(folium.Polygon(locations=locations, color='red',
+                                          fill_color='red', fill_opacity=0.7, 
+                                          weight=3, popup='Hi'))
         marker = list(self.map._children.values())[-1]
         polygon_2 = polygon_templ.render({'Polygon': marker.get_name(),
-                                      'location': locations,
-                                      'color': 'red',
-                                      'fill_color': 'red',
-                                      'fill_opacity': 0.7,
-                                      'weight': 3})
+                                          'location': locations,
+                                          'color': 'red',
+                                          'fill_color': 'red',
+                                          'fill_opacity': 0.7,
+                                          'weight': 3})
         assert (''.join(polygon_2.split())[:-1] in
                 ''.join(self.map.get_root().render().split()))
 
         bounds = self.map.get_bounds()
-        assert bounds == [[[35.5636, 138.7634], [35.5629, 138.7664]], [[35.6636, 139.7634], [35.6629, 139.7664]]], bounds
+        assert bounds == [[[35.5636, 138.7634], [35.5629, 138.7664]],
+                          [[35.6636, 139.7634], [35.6629, 139.7664]]], bounds
 
 
     def test_poly_marker(self):