mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
Made GeoDjango GeometryField stop accepting a 'null' keyword argument as per its deprecation in 1.5.
This commit is contained in:
parent
7379d9acea
commit
425a429208
@ -1,7 +1,5 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import warnings
|
|
||||||
|
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.utils import six
|
from django.utils import six
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
@ -34,10 +32,6 @@ class GeometryField(forms.Field):
|
|||||||
# defaults (e.g., allow None).
|
# defaults (e.g., allow None).
|
||||||
self.srid = kwargs.pop('srid', None)
|
self.srid = kwargs.pop('srid', None)
|
||||||
self.geom_type = kwargs.pop('geom_type', self.geom_type)
|
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)
|
super(GeometryField, self).__init__(**kwargs)
|
||||||
self.widget.attrs['geom_type'] = self.geom_type
|
self.widget.attrs['geom_type'] = self.geom_type
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user