summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2018-11-22 11:21:58 +0100
committerClaude Paroz <claude@2xlibre.net>2018-11-23 09:39:02 +0100
commitd7e18a509edf63282e76e65de3e94905ed53e984 (patch)
treee9c04eb53d37527914dc00e5002bdbdba07aa9d4 /django
parent31408446b3880115a1f121230ce5e32e4e066a4b (diff)
Fixed #29978 -- Catched GDALException in GeometryField.to_python
Diffstat (limited to 'django')
-rw-r--r--django/contrib/gis/forms/fields.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/django/contrib/gis/forms/fields.py b/django/contrib/gis/forms/fields.py
index d05518c971..269981048d 100644
--- a/django/contrib/gis/forms/fields.py
+++ b/django/contrib/gis/forms/fields.py
@@ -1,4 +1,5 @@
from django import forms
+from django.contrib.gis.gdal import GDALException
from django.contrib.gis.geos import GEOSException, GEOSGeometry
from django.utils.translation import gettext_lazy as _
@@ -36,7 +37,10 @@ class GeometryField(forms.Field):
if not isinstance(value, GEOSGeometry):
if hasattr(self.widget, 'deserialize'):
- value = self.widget.deserialize(value)
+ try:
+ value = self.widget.deserialize(value)
+ except GDALException:
+ value = None
else:
try:
value = GEOSGeometry(value)