summaryrefslogtreecommitdiff
path: root/django/db/backends/sqlite3
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2017-03-09 16:17:41 +0100
committerTim Graham <timograham@gmail.com>2017-06-28 14:07:55 -0400
commit550cb3a365dee4edfdd1563224d5304de2a57fda (patch)
treefb532f38774ff7619edd2a4532c3daae1ee0ac5a /django/db/backends/sqlite3
parent43a4835edf32c57eb74c0eb207c276734a34abcf (diff)
Fixed #27818 -- Replaced try/except/pass with contextlib.suppress().
Diffstat (limited to 'django/db/backends/sqlite3')
-rw-r--r--django/db/backends/sqlite3/operations.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/django/db/backends/sqlite3/operations.py b/django/db/backends/sqlite3/operations.py
index 040e148c34..5ffc65e08a 100644
--- a/django/db/backends/sqlite3/operations.py
+++ b/django/db/backends/sqlite3/operations.py
@@ -1,5 +1,6 @@
import datetime
import uuid
+from contextlib import suppress
from django.conf import settings
from django.core.exceptions import FieldError
@@ -33,7 +34,9 @@ class DatabaseOperations(BaseDatabaseOperations):
bad_aggregates = (aggregates.Sum, aggregates.Avg, aggregates.Variance, aggregates.StdDev)
if isinstance(expression, bad_aggregates):
for expr in expression.get_source_expressions():
- try:
+ # Not every subexpression has an output_field which is fine
+ # to ignore.
+ with suppress(FieldError):
output_field = expr.output_field
if isinstance(output_field, bad_fields):
raise NotImplementedError(
@@ -41,10 +44,6 @@ class DatabaseOperations(BaseDatabaseOperations):
'aggregations on date/time fields in sqlite3 '
'since date/time is saved as text.'
)
- except FieldError:
- # Not every subexpression has an output_field which is fine
- # to ignore.
- pass
def date_extract_sql(self, lookup_type, field_name):
"""