From 09ffc5c1212d4ced58b708cbbf3dfbfb77b782ca Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Thu, 1 Dec 2022 20:23:43 +0100 Subject: Fixed #33308 -- Added support for psycopg version 3. Thanks Simon Charette, Tim Graham, and Adam Johnson for reviews. Co-authored-by: Florian Apolloner Co-authored-by: Mariusz Felisiak --- tests/postgres_tests/test_apps.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/postgres_tests/test_apps.py') diff --git a/tests/postgres_tests/test_apps.py b/tests/postgres_tests/test_apps.py index 7c4cc38183..d9fb962251 100644 --- a/tests/postgres_tests/test_apps.py +++ b/tests/postgres_tests/test_apps.py @@ -19,6 +19,7 @@ try: DateTimeRange, DateTimeTZRange, NumericRange, + is_psycopg3, ) except ImportError: pass @@ -59,6 +60,7 @@ class PostgresConfigTests(TestCase): MigrationWriter.serialize(field) assertNotSerializable() + import_name = "psycopg.types.range" if is_psycopg3 else "psycopg2.extras" with self.modify_settings(INSTALLED_APPS={"append": "django.contrib.postgres"}): for default, test_field in tests: with self.subTest(default=default): @@ -68,16 +70,12 @@ class PostgresConfigTests(TestCase): imports, { "import django.contrib.postgres.fields.ranges", - "import psycopg2.extras", + f"import {import_name}", }, ) self.assertIn( - "%s.%s(default=psycopg2.extras.%r)" - % ( - field.__module__, - field.__class__.__name__, - default, - ), + f"{field.__module__}.{field.__class__.__name__}" + f"(default={import_name}.{default!r})", serialized_field, ) assertNotSerializable() -- cgit v1.3