summaryrefslogtreecommitdiff
path: root/django/contrib/gis/db/models/fields.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-09-07 08:16:21 -0400
committerGitHub <noreply@github.com>2017-09-07 08:16:21 -0400
commit6e4c6281dbb7ee12bcdc22620894edb4e9cf623f (patch)
tree1c21218d4b6f00c499f18943d5190ebe7b5248c9 /django/contrib/gis/db/models/fields.py
parent8b2515a450ef376b9205029090af0a79c8341bd7 (diff)
Reverted "Fixed #27818 -- Replaced try/except/pass with contextlib.suppress()."
This reverts commit 550cb3a365dee4edfdd1563224d5304de2a57fda because try/except performs better.
Diffstat (limited to 'django/contrib/gis/db/models/fields.py')
-rw-r--r--django/contrib/gis/db/models/fields.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/gis/db/models/fields.py b/django/contrib/gis/db/models/fields.py
index 8265815c30..d165313468 100644
--- a/django/contrib/gis/db/models/fields.py
+++ b/django/contrib/gis/db/models/fields.py
@@ -1,5 +1,4 @@
from collections import defaultdict, namedtuple
-from contextlib import suppress
from django.contrib.gis import forms, gdal
from django.contrib.gis.db.models.proxy import SpatialProxy
@@ -157,8 +156,10 @@ class BaseSpatialField(Field):
if isinstance(value, gdal.GDALRaster):
return value
elif is_candidate:
- with suppress(GDALException):
+ try:
return gdal.GDALRaster(value)
+ except GDALException:
+ pass
elif isinstance(value, dict):
try:
return gdal.GDALRaster(value)