Adding details to CHANGES and requirements. Tweaked pattern for startswith on URL checking.

jreades · jreades · commit b37df58ec6e9 · 2017-03-09T11:13:01.000Z
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -13,6 +13,7 @@
 - Added `smooth_factor `option to `GeoJSON`, `TopoJSON` and `Choropleth` (JamesGardiner #428)
 - `Map` object now accepts Leaflet global switches (sgvandijk #424)
 - Added weight option to CircleMarker (palewire #581)
+- Added requests support to enable http(s) and ftp for geo_path parameter
 
 Bug Fixes
 
diff --git a/folium/folium.py b/folium/folium.py
@@ -252,7 +252,7 @@ def choropleth(self, geo_path=None, geo_str=None, data_out='data.json',
 
         # Create GeoJson object
         if geo_path:
-            if geo_path.lower().startswith(('http', 'ftp', 'https')):
+            if geo_path.lower().startswith(('http:', 'ftp':, 'https:')):
                 geo_data = requests.get(geo_path).json()
             else:
                 geo_data = open(geo_path)
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 Jinja2
 branca
 six
+requests

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 Jinja2
 branca
 six
 +requests