Fixed #27818 -- Replaced try/except/pass with contextlib.suppress().

5 files changed, 10 insertions, 15 deletions

diff --git a/tests/postgres_tests/test_aggregates.py b/tests/postgres_tests/test_aggregates.py
index 056d08441b..1fe8a1bf03 100644
--- a/tests/postgres_tests/test_aggregates.py
+++ b/tests/postgres_tests/test_aggregates.py
@@ -1,4 +1,5 @@
 import json
+from contextlib import suppress
 
 from django.db.models.expressions import F, Value
 from django.test.testcases import skipUnlessDBFeature
@@ -7,14 +8,12 @@ from django.test.utils import Approximate
 from . import PostgreSQLTestCase
 from .models import AggregateTestModel, StatTestModel
 
-try:
+with suppress(ImportError):  # psycopg2 is not installed
     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):
diff --git a/tests/postgres_tests/test_array.py b/tests/postgres_tests/test_array.py
index e2e4ccdeb2..7378b5c12d 100644
--- a/tests/postgres_tests/test_array.py
+++ b/tests/postgres_tests/test_array.py
@@ -2,6 +2,7 @@ import decimal
 import json
 import unittest
 import uuid
+from contextlib import suppress
 
 from django import forms
 from django.core import exceptions, serializers, validators
@@ -19,13 +20,11 @@ from .models import (
     PostgreSQLModel, Tag,
 )
 
-try:
+with suppress(ImportError):
     from django.contrib.postgres.fields import ArrayField
     from django.contrib.postgres.forms import (
         SimpleArrayField, SplitArrayField, SplitArrayWidget,
     )
-except ImportError:
-    pass
 
 
 class TestSaveLoad(PostgreSQLTestCase):
diff --git a/tests/postgres_tests/test_hstore.py b/tests/postgres_tests/test_hstore.py
index 069e570f51..55b179ba5e 100644
--- a/tests/postgres_tests/test_hstore.py
+++ b/tests/postgres_tests/test_hstore.py
@@ -1,4 +1,5 @@
 import json
+from contextlib import suppress
 
 from django.core import exceptions, serializers
 from django.forms import Form
@@ -7,12 +8,10 @@ from django.test.utils import modify_settings
 from . import PostgreSQLTestCase
 from .models import HStoreModel
 
-try:
+with suppress(ImportError):
     from django.contrib.postgres import forms
     from django.contrib.postgres.fields import HStoreField
     from django.contrib.postgres.validators import KeysValidator
-except ImportError:
-    pass
 
 
 @modify_settings(INSTALLED_APPS={'append': 'django.contrib.postgres'})
diff --git a/tests/postgres_tests/test_json.py b/tests/postgres_tests/test_json.py
index 2506fc36d6..20650ae95b 100644
--- a/tests/postgres_tests/test_json.py
+++ b/tests/postgres_tests/test_json.py
@@ -1,5 +1,6 @@
 import datetime
 import uuid
+from contextlib import suppress
 from decimal import Decimal
 
 from django.core import exceptions, serializers
@@ -11,11 +12,9 @@ from django.utils.html import escape
 from . import PostgreSQLTestCase
 from .models import JSONModel
 
-try:
+with suppress(ImportError):
     from django.contrib.postgres import forms
     from django.contrib.postgres.fields import JSONField
-except ImportError:
-    pass
 
 
 @skipUnlessDBFeature('has_jsonb_datatype')
diff --git a/tests/postgres_tests/test_ranges.py b/tests/postgres_tests/test_ranges.py
index d87ad36438..da72240bf4 100644
--- a/tests/postgres_tests/test_ranges.py
+++ b/tests/postgres_tests/test_ranges.py
@@ -1,5 +1,6 @@
 import datetime
 import json
+from contextlib import suppress
 
 from django import forms
 from django.core import exceptions, serializers
@@ -10,14 +11,12 @@ from django.utils import timezone
 from . import PostgreSQLTestCase
 from .models import RangeLookupsModel, RangesModel
 
-try:
+with suppress(ImportError):
     from psycopg2.extras import DateRange, DateTimeTZRange, NumericRange
     from django.contrib.postgres import fields as pg_fields, forms as pg_forms
     from django.contrib.postgres.validators import (
         RangeMaxValueValidator, RangeMinValueValidator,
     )
-except ImportError:
-    pass
 
 
 class TestSaveLoad(PostgreSQLTestCase):