Refs #33308 -- Moved psycopg2 imports to the psycopg_any module.

tests/postgres_tests/test_apps.py

@@ -8,14 +8,18 @@ from django.test import TestCase
 from django.test.utils import modify_settings
 
 try:
-    from psycopg2.extras import DateRange, DateTimeRange, DateTimeTZRange, NumericRange
-
     from django.contrib.postgres.fields import (
         DateRangeField,
         DateTimeRangeField,
         DecimalRangeField,
         IntegerRangeField,
     )
+    from django.db.backends.postgresql.psycopg_any import (
+        DateRange,
+        DateTimeRange,
+        DateTimeTZRange,
+        NumericRange,
+    )
 except ImportError:
     pass
 

tests/postgres_tests/test_array.py

@@ -31,8 +31,6 @@ from .models import (
 )
 
 try:
-    from psycopg2.extras import NumericRange
-
     from django.contrib.postgres.aggregates import ArrayAgg
     from django.contrib.postgres.expressions import ArraySubquery
     from django.contrib.postgres.fields import ArrayField
@@ -42,6 +40,7 @@ try:
         SplitArrayField,
         SplitArrayWidget,
     )
+    from django.db.backends.postgresql.psycopg_any import NumericRange
 except ImportError:
     pass
 

tests/postgres_tests/test_bulk_update.py

@@ -11,9 +11,9 @@ from .models import (
 )
 
 try:
-    from psycopg2.extras import DateRange, NumericRange
+    from django.db.backends.postgresql.psycopg_any import DateRange, NumericRange
 except ImportError:
-    pass  # psycopg2 isn't installed.
+    pass  # psycopg isn't installed.
 
 
 class BulkSaveTests(PostgreSQLTestCase):

tests/postgres_tests/test_constraints.py

@@ -25,14 +25,13 @@ from . import PostgreSQLTestCase
 from .models import HotelReservation, IntegerArrayModel, RangesModel, Room, Scene
 
 try:
-    from psycopg2.extras import DateRange, NumericRange
-
     from django.contrib.postgres.constraints import ExclusionConstraint
     from django.contrib.postgres.fields import (
         DateTimeRangeField,
         RangeBoundary,
         RangeOperators,
     )
+    from django.db.backends.postgresql.psycopg_any import DateRange, NumericRange
 except ImportError:
     pass
 

tests/postgres_tests/test_ranges.py

@@ -20,14 +20,17 @@ from .models import (
 )
 
 try:
-    from psycopg2.extras import DateRange, DateTimeTZRange, NumericRange
-
     from django.contrib.postgres import fields as pg_fields
     from django.contrib.postgres import forms as pg_forms
     from django.contrib.postgres.validators import (
         RangeMaxValueValidator,
         RangeMinValueValidator,
     )
+    from django.db.backends.postgresql.psycopg_any import (
+        DateRange,
+        DateTimeTZRange,
+        NumericRange,
+    )
 except ImportError:
     pass