diff options
| author | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2024-12-12 17:39:58 +0100 |
|---|---|---|
| committer | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2025-01-15 22:28:37 +0100 |
| commit | 9a3f86e96009c1137b286f6d579b9d812a0dee69 (patch) | |
| tree | 65c8a7d094e5db90a0a2ffe62f36f5ecfce211fb /django/conf | |
| parent | 9cb1ffa67bb0d13f86c2d4627428fcaa4513136d (diff) | |
Refs #34380 -- Changed the URLField default scheme to https and removed FORMS_URLFIELD_ASSUME_HTTPS per deprecation timeline.
Diffstat (limited to 'django/conf')
| -rw-r--r-- | django/conf/__init__.py | 17 | ||||
| -rw-r--r-- | django/conf/global_settings.py | 5 |
2 files changed, 0 insertions, 22 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 5568d7cc83..6b5f044e34 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -16,18 +16,12 @@ from pathlib import Path import django from django.conf import global_settings from django.core.exceptions import ImproperlyConfigured -from django.utils.deprecation import RemovedInDjango60Warning from django.utils.functional import LazyObject, empty ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE" DEFAULT_STORAGE_ALIAS = "default" STATICFILES_STORAGE_ALIAS = "staticfiles" -# RemovedInDjango60Warning. -FORMS_URLFIELD_ASSUME_HTTPS_DEPRECATED_MSG = ( - "The FORMS_URLFIELD_ASSUME_HTTPS transitional setting is deprecated." -) - class SettingsReference(str): """ @@ -186,12 +180,6 @@ class Settings: setattr(self, setting, setting_value) self._explicit_settings.add(setting) - if self.is_overridden("FORMS_URLFIELD_ASSUME_HTTPS"): - warnings.warn( - FORMS_URLFIELD_ASSUME_HTTPS_DEPRECATED_MSG, - RemovedInDjango60Warning, - ) - if hasattr(time, "tzset") and self.TIME_ZONE: # When we can, attempt to validate the timezone. If we can't find # this file, no check happens and it's harmless. @@ -236,11 +224,6 @@ class UserSettingsHolder: def __setattr__(self, name, value): self._deleted.discard(name) - if name == "FORMS_URLFIELD_ASSUME_HTTPS": - warnings.warn( - FORMS_URLFIELD_ASSUME_HTTPS_DEPRECATED_MSG, - RemovedInDjango60Warning, - ) super().__setattr__(name, value) def __delattr__(self, name): diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index f4535acb09..536bbb7c45 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -218,11 +218,6 @@ TEMPLATES = [] # Default form rendering class. FORM_RENDERER = "django.forms.renderers.DjangoTemplates" -# RemovedInDjango60Warning: It's a transitional setting helpful in early -# adoption of "https" as the new default value of forms.URLField.assume_scheme. -# Set to True to assume "https" during the Django 5.x release cycle. -FORMS_URLFIELD_ASSUME_HTTPS = False - # Default email address to use for various automated correspondence from # the site managers. DEFAULT_FROM_EMAIL = "webmaster@localhost" |