Skip to content

Commit 8a9bc2e

Browse files
committed
fix some lints
1 parent 30ca3e4 commit 8a9bc2e

4 files changed

Lines changed: 22 additions & 15 deletions

File tree

folium/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
from .features import (
1010
CircleMarker, ClickForMarker, CustomIcon, DivIcon, GeoJson, LatLngPopup,
11-
MarkerCluster, PolyLine, RegularPolygonMarker, TopoJson, Vega, VegaLite, WmsTileLayer,
11+
MarkerCluster, PolyLine, RegularPolygonMarker, TopoJson, Vega, VegaLite,
12+
WmsTileLayer,
1213
)
1314

1415
from .folium import Map

folium/features.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import json
1212

1313
from branca.colormap import LinearColormap
14-
from branca.element import (CssLink, Element, Figure, JavascriptLink, MacroElement)
14+
from branca.element import (CssLink, Element, Figure, JavascriptLink, MacroElement) # noqa
1515
from branca.utilities import (_locations_mirror, _locations_tolist, _parse_size,
1616
image_to_url, iter_points, none_max, none_min)
1717

@@ -250,11 +250,11 @@ def render(self, **kwargs):
250250
""").render(this=self, **kwargs)), name=self.get_name())
251251

252252
figure.header.add_child(
253-
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js'),
253+
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js'), # noqa
254254
name='d3')
255255

256256
figure.header.add_child(
257-
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/vega/1.4.3/vega.min.js'),
257+
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/vega/1.4.3/vega.min.js'), # noqa
258258
name='vega')
259259

260260
figure.header.add_child(
@@ -327,7 +327,9 @@ def render(self, **kwargs):
327327
mode: "vega-lite",
328328
spec: {{this.json}}
329329
};
330-
vg.embed({{this.get_name()}}, embedSpec, function(error, result) {});
330+
vg.embed(
331+
{{this.get_name()}}, embedSpec, function(error, result) {}
332+
);
331333
""").render(this=self)), name=self.get_name())
332334

333335
figure = self.get_root()
@@ -349,15 +351,15 @@ def render(self, **kwargs):
349351
name='d3')
350352

351353
figure.header.add_child(
352-
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/vega/2.6.5/vega.min.js'),
354+
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/vega/2.6.5/vega.min.js'), # noqa
353355
name='vega')
354356

355357
figure.header.add_child(
356-
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/vega-lite/1.3.1/vega-lite.min.js'),
358+
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/vega-lite/1.3.1/vega-lite.min.js'), # noqa
357359
name='vega-lite')
358360

359361
figure.header.add_child(
360-
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/vega-embed/2.2.0/vega-embed.min.js'),
362+
JavascriptLink('https://cdnjs.cloudflare.com/ajax/libs/vega-embed/2.2.0/vega-embed.min.js'), # noqa
361363
name='vega-embed')
362364

363365

@@ -375,9 +377,9 @@ class GeoJson(Layer):
375377
in the JavaScript.
376378
* If str, then data will be passed to the JavaScript as-is.
377379
style_function: function, default None
378-
A function mapping a GeoJson Feature to a style dict.
380+
Function mapping a GeoJson Feature to a style dict.
379381
highlight_function: function, default None
380-
A function mapping a GeoJson Feature to a style dict for mouse over events.
382+
Function mapping a GeoJson Feature to a style dict for mouse events.
381383
name : string, default None
382384
The name of the Layer, as it will appear in LayerControls
383385
overlay : bool, default False

folium/map.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from collections import OrderedDict
1818

19-
from branca.element import CssLink, Element, Figure, Html, JavascriptLink, MacroElement
19+
from branca.element import CssLink, Element, Figure, Html, JavascriptLink, MacroElement # noqa
2020
from branca.utilities import _parse_size
2121

2222
from jinja2 import Environment, PackageLoader, Template
@@ -211,7 +211,11 @@ def __init__(self, location=None, width='100%', height='100%',
211211
self.crs = crs
212212
self.control_scale = control_scale
213213

214-
self.global_switches = GlobalSwitches(prefer_canvas, no_touch, disable_3d)
214+
self.global_switches = GlobalSwitches(
215+
prefer_canvas,
216+
no_touch,
217+
disable_3d
218+
)
215219

216220
if tiles:
217221
self.add_tile_layer(
@@ -277,7 +281,9 @@ def _to_png(self):
277281
with tempfile.NamedTemporaryFile(suffix='.html') as f:
278282
fname = f.name
279283
self.save(fname)
280-
driver = selenium.webdriver.PhantomJS(service_log_path=os.path.devnull)
284+
driver = selenium.webdriver.PhantomJS(
285+
service_log_path=os.path.devnull
286+
)
281287
driver.get('file://{}'.format(fname))
282288
driver.maximize_window()
283289
# Ignore user map size.

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
from __future__ import (absolute_import, division, print_function)
22

33
import os
4-
import sys
54
from setuptools import setup
6-
from setuptools.command.test import test as TestCommand
75

86
import versioneer
97

0 commit comments

Comments
 (0)