From aa1c1756870b2908486d9e685ec02cbada501e45 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Tue, 3 Sep 2013 09:05:01 +0200
Subject: [PATCH] [1.6.x] Fixed syntax error in OSMWidget

Backport of 6ecbac21a from master.
---
 django/contrib/gis/forms/widgets.py       | 2 +-
 django/contrib/gis/tests/test_geoforms.py | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py
index 0102ab6745..87e49d73c0 100644
--- a/django/contrib/gis/forms/widgets.py
+++ b/django/contrib/gis/forms/widgets.py
@@ -111,5 +111,5 @@ class OSMWidget(BaseGeometryWidget):
             return 900913
 
     def render(self, name, value, attrs=None):
-        return super(self, OSMWidget).render(name, value,
+        return super(OSMWidget, self).render(name, value,
             {'default_lon': self.default_lon, 'default_lat': self.default_lat})
diff --git a/django/contrib/gis/tests/test_geoforms.py b/django/contrib/gis/tests/test_geoforms.py
index b4f608752a..1fd7f28106 100644
--- a/django/contrib/gis/tests/test_geoforms.py
+++ b/django/contrib/gis/tests/test_geoforms.py
@@ -242,6 +242,15 @@ class SpecializedFieldTest(SimpleTestCase):
         for invalid in [geom for key, geom in self.geometries.items() if key!='geometrycollection']:
             self.assertFalse(GeometryForm(data={'g': invalid.wkt}).is_valid())
 
+    def test_osm_widget(self):
+        class PointForm(forms.Form):
+            p = forms.PointField(widget=forms.OSMWidget)
+
+        geom = self.geometries['point']
+        form = PointForm(data={'p': geom})
+        self.assertIn("OpenStreetMap (Mapnik)", form.as_p())
+
+
 @skipUnless(HAS_GDAL and HAS_SPATIALREFSYS,
     "CustomGeometryWidgetTest needs gdal support and a spatial database")
 class CustomGeometryWidgetTest(SimpleTestCase):