From 8fdb5a656a35dc9beef4cf2b79a782068263c7ec Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 14 Jan 2021 09:57:22 +0100 Subject: [PATCH] Refs #12990 -- Removed django.contrib.postgres.fields.jsonb.KeyTransform/KeyTextTransform. Per deprecation timeline. --- django/contrib/postgres/fields/jsonb.py | 28 ------------------- docs/releases/4.0.txt | 3 ++ tests/postgres_tests/test_json_deprecation.py | 20 ------------- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/django/contrib/postgres/fields/jsonb.py b/django/contrib/postgres/fields/jsonb.py index d2e44135ba..29e8480665 100644 --- a/django/contrib/postgres/fields/jsonb.py +++ b/django/contrib/postgres/fields/jsonb.py @@ -1,11 +1,4 @@ -import warnings - from django.db.models import JSONField as BuiltinJSONField -from django.db.models.fields.json import ( - KeyTextTransform as BuiltinKeyTextTransform, - KeyTransform as BuiltinKeyTransform, -) -from django.utils.deprecation import RemovedInDjango40Warning __all__ = ['JSONField'] @@ -19,24 +12,3 @@ class JSONField(BuiltinJSONField): 'hint': 'Use django.db.models.JSONField instead.', 'id': 'fields.E904', } - - -class KeyTransform(BuiltinKeyTransform): - def __init__(self, *args, **kwargs): - warnings.warn( - 'django.contrib.postgres.fields.jsonb.KeyTransform is deprecated ' - 'in favor of django.db.models.fields.json.KeyTransform.', - RemovedInDjango40Warning, stacklevel=2, - ) - super().__init__(*args, **kwargs) - - -class KeyTextTransform(BuiltinKeyTextTransform): - def __init__(self, *args, **kwargs): - warnings.warn( - 'django.contrib.postgres.fields.jsonb.KeyTextTransform is ' - 'deprecated in favor of ' - 'django.db.models.fields.json.KeyTextTransform.', - RemovedInDjango40Warning, stacklevel=2, - ) - super().__init__(*args, **kwargs) diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt index f25af43549..ff14570063 100644 --- a/docs/releases/4.0.txt +++ b/docs/releases/4.0.txt @@ -316,3 +316,6 @@ to remove usage of these features. * The ``django.contrib.postgres.fields.JSONField`` model field is removed, except for support in historical migrations. + +* ``django.contrib.postgres.fields.jsonb.KeyTransform`` and + ``django.contrib.postgres.fields.jsonb.KeyTextTransform`` are removed. diff --git a/tests/postgres_tests/test_json_deprecation.py b/tests/postgres_tests/test_json_deprecation.py index 7c78c6a864..d55b71efb0 100644 --- a/tests/postgres_tests/test_json_deprecation.py +++ b/tests/postgres_tests/test_json_deprecation.py @@ -1,8 +1,5 @@ try: from django.contrib.postgres import forms - from django.contrib.postgres.fields.jsonb import ( - KeyTextTransform, KeyTransform, - ) except ImportError: pass @@ -19,20 +16,3 @@ class DeprecationTests(PostgreSQLSimpleTestCase): ) with self.assertWarnsMessage(RemovedInDjango40Warning, msg): forms.JSONField() - - def test_key_transform_deprecation_message(self): - msg = ( - 'django.contrib.postgres.fields.jsonb.KeyTransform is deprecated ' - 'in favor of django.db.models.fields.json.KeyTransform.' - ) - with self.assertWarnsMessage(RemovedInDjango40Warning, msg): - KeyTransform('foo', 'bar') - - def test_key_text_transform_deprecation_message(self): - msg = ( - 'django.contrib.postgres.fields.jsonb.KeyTextTransform is ' - 'deprecated in favor of ' - 'django.db.models.fields.json.KeyTextTransform.' - ) - with self.assertWarnsMessage(RemovedInDjango40Warning, msg): - KeyTextTransform('foo', 'bar')