diff options
author | Florian Apolloner <florian@apolloner.eu> | 2022-12-12 08:25:05 +0100 |
---|---|---|
committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2022-12-12 08:36:17 +0100 |
commit | 2ebfbd894e21e1656c1e1f32d98b8df7a32d3649 (patch) | |
tree | d74840ed5991c06abd3b09067d683fdc2282d7c6 /tests/postgres_tests | |
parent | c5ed884eabf3b2b67581c55bf6c87e721f69157f (diff) | |
download | django-2ebfbd894e21e1656c1e1f32d98b8df7a32d3649.tar.gz |
Refs #33308 -- Moved psycopg2 imports to the psycopg_any module.
Diffstat (limited to 'tests/postgres_tests')
-rw-r--r-- | tests/postgres_tests/test_apps.py | 8 | ||||
-rw-r--r-- | tests/postgres_tests/test_array.py | 3 | ||||
-rw-r--r-- | tests/postgres_tests/test_bulk_update.py | 4 | ||||
-rw-r--r-- | tests/postgres_tests/test_constraints.py | 3 | ||||
-rw-r--r-- | tests/postgres_tests/test_ranges.py | 7 |
5 files changed, 15 insertions, 10 deletions
diff --git a/tests/postgres_tests/test_apps.py b/tests/postgres_tests/test_apps.py index 678e5a9374..7c4cc38183 100644 --- a/tests/postgres_tests/test_apps.py +++ b/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 diff --git a/tests/postgres_tests/test_array.py b/tests/postgres_tests/test_array.py index e1d9be6c02..a3c26fddae 100644 --- a/tests/postgres_tests/test_array.py +++ b/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 diff --git a/tests/postgres_tests/test_bulk_update.py b/tests/postgres_tests/test_bulk_update.py index f0b473efa7..85dfcedd09 100644 --- a/tests/postgres_tests/test_bulk_update.py +++ b/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): diff --git a/tests/postgres_tests/test_constraints.py b/tests/postgres_tests/test_constraints.py index 9aa5bfdbb8..ad21ffa2b5 100644 --- a/tests/postgres_tests/test_constraints.py +++ b/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 diff --git a/tests/postgres_tests/test_ranges.py b/tests/postgres_tests/test_ranges.py index 870039a6ad..038e0233c4 100644 --- a/tests/postgres_tests/test_ranges.py +++ b/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 |