summaryrefslogtreecommitdiff
path: root/django/conf/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/conf/__init__.py')
-rw-r--r--django/conf/__init__.py17
1 files changed, 0 insertions, 17 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):