Consistent use of the kw attr

Author: ocefpaf

folium/features.py

@@ -18,7 +18,7 @@
 class WmsTileLayer(TileLayer):
     def __init__(self, url, name=None,
                  format=None, layers=None, transparent=True,
-                 attribution=None):
+                 attr=None):
         """
         TODO docstring here
 
@@ -30,10 +30,7 @@ def __init__(self, url, name=None,
         self.format = format
         self.layers = layers
         self.transparent = transparent
-        # if attribution is None:
-        #     raise ValueError('WMS must'
-        #                      ' also be passed an attribution')
-        self.attribution = attribution
+        self.attr = attr
 
         self._template = Template(u"""
         {% macro script(this, kwargs) %}
@@ -43,7 +40,7 @@ def __init__(self, url, name=None,
                     format:'{{ this.format }}',
                     transparent: {{ this.transparent.__str__().lower() }},
                     layers:'{{ this.layers }}'
-                    {% if this.attribution %}, attribution:'{{this.attribution}}'{% endif %}
+                    {% if this.attr %}, attribution:'{{this.attr}}'{% endif %}
                     }
                 ).addTo({{this._parent.get_name()}});
 
@@ -619,7 +616,7 @@ def __init__(self, locations, color=None, weight=None,
 
 
 class ImageOverlay(MacroElement):
-    def __init__(self, image, bounds, opacity=1., attribution=None,
+    def __init__(self, image, bounds, opacity=1., attr=None,
                  origin='upper', colormap=None, mercator_project=False):
         """
         Used to load and display a single image over specific bounds of
@@ -664,7 +661,7 @@ def __init__(self, image, bounds, opacity=1., attribution=None,
         self.bounds = json.loads(json.dumps(bounds))
         options = {
             'opacity': opacity,
-            'attribution': attribution,
+            'attribution': attr,
         }
         self.options = json.dumps({key: val for key, val
                                    in options.items() if val},

folium/folium.py

@@ -68,7 +68,7 @@ def add_wms_layer(self, wms_name=None, wms_url=None, wms_format=None,
                       FutureWarning, stacklevel=2)
         wms = WmsTileLayer(wms_url, name=wms_name, format=wms_format,
                            layers=wms_layers, transparent=wms_transparent,
-                           attribution=None)
+                           attr=None)
         self.add_children(wms, name=wms_name)
 
     def simple_marker(self, location=None, popup=None,

tests/test_features.py

@@ -99,7 +99,7 @@ def test_wms_service():
                               name='test',
                               format='image/png',
                               layers='nexrad-n0r-900913',
-                              attribution=u"Weather data © 2012 IEM Nexrad",
+                              attr=u"Weather data © 2012 IEM Nexrad",
                               transparent=True)
     w.add_to(m)
     m._repr_html_()