Merge pull request #1411 from ocefpaf/py2k_cleanup

ocefpaf · web-flow · commit 59f3af5f2395 · 2021-12-29T15:17:58.000-03:00
py2k cleanup
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Folium documentation build configuration file, created by
 # sphinx-quickstart on Sun May 19 19:39:34 2013.
 #
diff --git a/folium/__init__.py b/folium/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import sys
 
 import branca
diff --git a/folium/features.py b/folium/features.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Leaflet GeoJson and miscellaneous features.
 
diff --git a/folium/folium.py b/folium/folium.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Make beautiful, interactive maps with Python and Leaflet.js
 
diff --git a/folium/map.py b/folium/map.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Classes for drawing maps.
 
diff --git a/folium/plugins/__init__.py b/folium/plugins/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Folium plugins
 --------------
diff --git a/folium/plugins/antpath.py b/folium/plugins/antpath.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.elements import JSCSSMixin
 from folium.vector_layers import path_options, BaseMultiLocation
 
diff --git a/folium/plugins/beautify_icon.py b/folium/plugins/beautify_icon.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/boat_marker.py b/folium/plugins/boat_marker.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.elements import JSCSSMixin
 from folium.map import Marker
 from folium.utilities import parse_options
diff --git a/folium/plugins/draw.py b/folium/plugins/draw.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import Element, Figure, MacroElement
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/fast_marker_cluster.py b/folium/plugins/fast_marker_cluster.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.plugins.marker_cluster import MarkerCluster
 from folium.utilities import if_pandas_df_convert_to_numpy, validate_location
 
diff --git a/folium/plugins/feature_group_sub_group.py b/folium/plugins/feature_group_sub_group.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.elements import JSCSSMixin
 from folium.map import Layer
 
diff --git a/folium/plugins/float_image.py b/folium/plugins/float_image.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from jinja2 import Template
diff --git a/folium/plugins/fullscreen.py b/folium/plugins/fullscreen.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/heat_map.py b/folium/plugins/heat_map.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import warnings
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/heat_map_withtime.py b/folium/plugins/heat_map_withtime.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import Element, Figure
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/marker_cluster.py b/folium/plugins/marker_cluster.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.elements import JSCSSMixin
 from folium.map import Layer, Marker
 from folium.utilities import validate_locations, parse_options
diff --git a/folium/plugins/measure_control.py b/folium/plugins/measure_control.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/minimap.py b/folium/plugins/minimap.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/mouse_position.py b/folium/plugins/mouse_position.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/pattern.py b/folium/plugins/pattern.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/polyline_offset.py b/folium/plugins/polyline_offset.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.elements import JSCSSMixin
 from folium.vector_layers import PolyLine
 
diff --git a/folium/plugins/polyline_text_path.py b/folium/plugins/polyline_text_path.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.elements import JSCSSMixin
 from folium.features import MacroElement
 from folium.utilities import parse_options
diff --git a/folium/plugins/scroll_zoom_toggler.py b/folium/plugins/scroll_zoom_toggler.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from jinja2 import Template
diff --git a/folium/plugins/search.py b/folium/plugins/search.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from folium import Map
diff --git a/folium/plugins/semicircle.py b/folium/plugins/semicircle.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.elements import JSCSSMixin
 from folium.map import Marker
 from folium.utilities import parse_options
diff --git a/folium/plugins/terminator.py b/folium/plugins/terminator.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from branca.element import MacroElement
 
 from folium.elements import JSCSSMixin
diff --git a/folium/plugins/time_slider_choropleth.py b/folium/plugins/time_slider_choropleth.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.elements import JSCSSMixin
 from folium.features import GeoJson
 from folium.map import Layer
diff --git a/folium/plugins/timestamped_geo_json.py b/folium/plugins/timestamped_geo_json.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import json
 
 from branca.element import MacroElement
diff --git a/folium/plugins/timestamped_wmstilelayer.py b/folium/plugins/timestamped_wmstilelayer.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from folium.elements import JSCSSMixin
 from folium.map import Layer
 from folium.raster_layers import WmsTileLayer
diff --git a/folium/raster_layers.py b/folium/raster_layers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Wraps leaflet TileLayer, WmsTileLayer (TileLayer.WMS), ImageOverlay, and VideoOverlay
 
diff --git a/folium/vector_layers.py b/folium/vector_layers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Wraps leaflet Polyline, Polygon, Rectangle, Circle, and CircleMarker
 
diff --git a/setup.py b/setup.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import (absolute_import, division, print_function)
-
 import os
 import sys
 from setuptools import setup
diff --git a/tests/plugins/test_antpath.py b/tests/plugins/test_antpath.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test AntPath
 -------------
diff --git a/tests/plugins/test_beautify_icon.py b/tests/plugins/test_beautify_icon.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test BeautifyIcon
 ---------------
diff --git a/tests/plugins/test_boat_marker.py b/tests/plugins/test_boat_marker.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test BoatMarker
 ---------------
diff --git a/tests/plugins/test_dual_map.py b/tests/plugins/test_dual_map.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test DualMap
 ------------
diff --git a/tests/plugins/test_fast_marker_cluster.py b/tests/plugins/test_fast_marker_cluster.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test FastMarkerCluster
 ----------------------
diff --git a/tests/plugins/test_feature_group_sub_group.py b/tests/plugins/test_feature_group_sub_group.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test MarkerCluster
 ------------------
diff --git a/tests/plugins/test_float_image.py b/tests/plugins/test_float_image.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test FloatImage
 ---------------
diff --git a/tests/plugins/test_fullscreen.py b/tests/plugins/test_fullscreen.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test Fullscreen
 ----------------
diff --git a/tests/plugins/test_heat_map.py b/tests/plugins/test_heat_map.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test HeatMap
 ------------
diff --git a/tests/plugins/test_heat_map_withtime.py b/tests/plugins/test_heat_map_withtime.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test HeatMapWithTime
 ------------
diff --git a/tests/plugins/test_marker_cluster.py b/tests/plugins/test_marker_cluster.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test MarkerCluster
 ------------------
diff --git a/tests/plugins/test_minimap.py b/tests/plugins/test_minimap.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test MiniMap
 ---------------
diff --git a/tests/plugins/test_pattern.py b/tests/plugins/test_pattern.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test pattern
 ---------------
diff --git a/tests/plugins/test_polyline_offset.py b/tests/plugins/test_polyline_offset.py
@@ -1,12 +1,8 @@
-# -*- coding: utf-8 -*-
-
 """
 Test PolyLineOffset
 -------------------
 """
 
-from __future__ import absolute_import, division, print_function
-
 import folium
 from folium import plugins
 from folium.utilities import normalize
diff --git a/tests/plugins/test_polyline_text_path.py b/tests/plugins/test_polyline_text_path.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test PolyLineTextPath
 ---------------
diff --git a/tests/plugins/test_scroll_zoom_toggler.py b/tests/plugins/test_scroll_zoom_toggler.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test ScrollZoomToggler
 ----------------------
diff --git a/tests/plugins/test_semicircle.py b/tests/plugins/test_semicircle.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test SemiCircle
 ---------------
diff --git a/tests/plugins/test_terminator.py b/tests/plugins/test_terminator.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test Terminator
 ---------------
diff --git a/tests/plugins/test_timestamped_geo_json.py b/tests/plugins/test_timestamped_geo_json.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test TimestampedGeoJson
 -----------------------
diff --git a/tests/selenium/conftest.py b/tests/selenium/conftest.py
@@ -1,4 +1,3 @@
-
 import pytest
 from selenium.webdriver import Chrome, ChromeOptions
 from selenium.webdriver.common.by import By
diff --git a/tests/selenium/test_selenium.py b/tests/selenium/test_selenium.py
@@ -1,4 +1,3 @@
-
 import base64
 import glob
 from html.parser import HTMLParser
diff --git a/tests/test_features.py b/tests/test_features.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """"
 Folium Features Tests
 ---------------------
diff --git a/tests/test_folium.py b/tests/test_folium.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Folium Tests
 -------
diff --git a/tests/test_map.py b/tests/test_map.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Folium map Tests
 ----------------
diff --git a/tests/test_raster_layers.py b/tests/test_raster_layers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Test raster_layers
 -----------------
diff --git a/tests/test_repr.py b/tests/test_repr.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """"
 Folium _repr_*_ Tests
 ---------------------
diff --git a/tests/test_vector_layers.py b/tests/test_vector_layers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """"
 Test Vector Layers
 ------------------

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-#`
`3`	`1`	`# Folium documentation build configuration file, created by`
`4`	`2`	`# sphinx-quickstart on Sun May 19 19:39:34 2013.`
`5`	`3`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`import sys`
`4`	`2`
`5`	`3`	`import branca`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`"""`
`4`	`2`	`Leaflet GeoJson and miscellaneous features.`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`from folium.elements import JSCSSMixin`
`4`	`2`	`from folium.vector_layers import path_options, BaseMultiLocation`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`from branca.element import MacroElement`
`4`	`2`
`5`	`3`	`from folium.elements import JSCSSMixin`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`from branca.element import Element, Figure, MacroElement`
`4`	`2`
`5`	`3`	`from folium.elements import JSCSSMixin`