From 425a4292083c7355a2a4ef9676f605a9c3b8fe70 Mon Sep 17 00:00:00 2001
From: Ramiro Morales <cramm0@gmail.com>
Date: Fri, 28 Jun 2013 22:42:10 -0300
Subject: [PATCH] Made GeoDjango GeometryField stop accepting a 'null' keyword
argument as per its deprecation in 1.5.
---
django/contrib/gis/forms/fields.py | 6 ------
1 file changed, 6 deletions(-)
diff --git a/django/contrib/gis/forms/fields.py b/django/contrib/gis/forms/fields.py
index 59e725926c..2fb8b545e0 100644
--- a/django/contrib/gis/forms/fields.py
+++ b/django/contrib/gis/forms/fields.py
@@ -1,7 +1,5 @@
from __future__ import unicode_literals
-import warnings
-
from django import forms
from django.utils import six
from django.utils.translation import ugettext_lazy as _
@@ -34,10 +32,6 @@ class GeometryField(forms.Field):
# defaults (e.g., allow None).
self.srid = kwargs.pop('srid', None)
self.geom_type = kwargs.pop('geom_type', self.geom_type)
- if 'null' in kwargs:
- kwargs.pop('null', True)
- warnings.warn("Passing 'null' keyword argument to GeometryField is deprecated.",
- DeprecationWarning, stacklevel=2)
super(GeometryField, self).__init__(**kwargs)
self.widget.attrs['geom_type'] = self.geom_type