mirror of
https://github.com/django/django.git
synced 2025-08-03 18:38:50 +00:00
Reverted "Fixed #27818 -- Replaced try/except/pass with contextlib.suppress()."
This reverts commit 550cb3a365
because try/except performs better.
This commit is contained in:
parent
8b2515a450
commit
6e4c6281db
66 changed files with 351 additions and 207 deletions
|
@ -1,5 +1,4 @@
|
|||
import json
|
||||
from contextlib import suppress
|
||||
|
||||
from django.db.models.expressions import F, Value
|
||||
from django.test.testcases import skipUnlessDBFeature
|
||||
|
@ -8,12 +7,14 @@ from django.test.utils import Approximate
|
|||
from . import PostgreSQLTestCase
|
||||
from .models import AggregateTestModel, StatTestModel
|
||||
|
||||
with suppress(ImportError): # psycopg2 is not installed
|
||||
try:
|
||||
from django.contrib.postgres.aggregates import (
|
||||
ArrayAgg, BitAnd, BitOr, BoolAnd, BoolOr, Corr, CovarPop, JSONBAgg,
|
||||
RegrAvgX, RegrAvgY, RegrCount, RegrIntercept, RegrR2, RegrSlope,
|
||||
RegrSXX, RegrSXY, RegrSYY, StatAggregate, StringAgg,
|
||||
)
|
||||
except ImportError:
|
||||
pass # psycopg2 is not installed
|
||||
|
||||
|
||||
class TestGeneralAggregate(PostgreSQLTestCase):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue