From 9a3f86e96009c1137b286f6d579b9d812a0dee69 Mon Sep 17 00:00:00 2001 From: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:39:58 +0100 Subject: Refs #34380 -- Changed the URLField default scheme to https and removed FORMS_URLFIELD_ASSUME_HTTPS per deprecation timeline. --- docs/ref/forms/fields.txt | 7 ------- docs/ref/settings.txt | 14 -------------- docs/releases/5.0.txt | 6 +++--- docs/releases/6.0.txt | 5 +++++ 4 files changed, 8 insertions(+), 24 deletions(-) (limited to 'docs') diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 91faea12f7..df8d36e365 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -1146,13 +1146,6 @@ For each field, we describe the default widget used if you don't specify provided value is ``"example.com"``, the normalized value will be ``"https://example.com"``. - .. deprecated:: 5.0 - - The default value for ``assume_scheme`` will change from ``"http"`` to - ``"https"`` in Django 6.0. Set :setting:`FORMS_URLFIELD_ASSUME_HTTPS` - transitional setting to ``True`` to opt into using ``"https"`` during - the Django 5.x release cycle. - ``UUIDField`` ------------- diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index e3a0f6d32a..9bd5aedbed 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1684,19 +1684,6 @@ renderers are: * ``'``:class:`django.forms.renderers.Jinja2`\ ``'`` * ``'``:class:`django.forms.renderers.TemplatesSetting`\ ``'`` -.. setting:: FORMS_URLFIELD_ASSUME_HTTPS - -``FORMS_URLFIELD_ASSUME_HTTPS`` -------------------------------- - -.. deprecated:: 5.0 - -Default: ``False`` - -Set this transitional setting to ``True`` to opt into using ``"https"`` as the -new default value of :attr:`URLField.assume_scheme -` during the Django 5.x release cycle. - .. setting:: FORMAT_MODULE_PATH ``FORMAT_MODULE_PATH`` @@ -3664,7 +3651,6 @@ File uploads Forms ----- * :setting:`FORM_RENDERER` -* :setting:`FORMS_URLFIELD_ASSUME_HTTPS` Globalization (``i18n``/``l10n``) --------------------------------- diff --git a/docs/releases/5.0.txt b/docs/releases/5.0.txt index 303ee88078..1cc5695d5a 100644 --- a/docs/releases/5.0.txt +++ b/docs/releases/5.0.txt @@ -622,9 +622,9 @@ Miscellaneous * The ``ForeignObject.get_reverse_joining_columns()`` method is deprecated. * The default scheme for ``forms.URLField`` will change from ``"http"`` to - ``"https"`` in Django 6.0. Set :setting:`FORMS_URLFIELD_ASSUME_HTTPS` - transitional setting to ``True`` to opt into assuming ``"https"`` during the - Django 5.x release cycle. + ``"https"`` in Django 6.0. Set ``FORMS_URLFIELD_ASSUME_HTTPS`` transitional + setting to ``True`` to opt into assuming ``"https"`` during the Django 5.x + release cycle. * ``FORMS_URLFIELD_ASSUME_HTTPS`` transitional setting is deprecated. diff --git a/docs/releases/6.0.txt b/docs/releases/6.0.txt index d8db925fd1..7ae24a422f 100644 --- a/docs/releases/6.0.txt +++ b/docs/releases/6.0.txt @@ -268,6 +268,11 @@ to remove usage of these features. * Support for calling ``format_html()`` without passing args or kwargs is removed. +* The default scheme for ``forms.URLField`` changed from ``"http"`` to + ``"https"``. + +* The ``FORMS_URLFIELD_ASSUME_HTTPS`` transitional setting is removed. + See :ref:`deprecated-features-5.1` for details on these changes, including how to remove usage of these features. -- cgit v1.3