summaryrefslogtreecommitdiff
path: root/django/conf/__init__.py
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2021-01-14 10:27:04 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-01-14 17:50:04 +0100
commit0aa6a602b2b1cac6fe8e55051eed493b9cea7b81 (patch)
tree172a55c26ec312e4988c40647632ecd9f866880f /django/conf/__init__.py
parente7208f13c0448387e56c340eed46e1ed9ef9997e (diff)
Refs #31842 -- Removed DEFAULT_HASHING_ALGORITHM transitional setting.
Per deprecation timeline.
Diffstat (limited to 'django/conf/__init__.py')
-rw-r--r--django/conf/__init__.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 8ebc3c70ce..03bf923bb2 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -9,22 +9,14 @@ for a list of all possible variables.
import importlib
import os
import time
-import warnings
from pathlib import Path
from django.conf import global_settings
from django.core.exceptions import ImproperlyConfigured
-from django.utils.deprecation import RemovedInDjango40Warning
from django.utils.functional import LazyObject, empty
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
-DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG = (
- 'The DEFAULT_HASHING_ALGORITHM transitional setting is deprecated. '
- 'Support for it and tokens, cookies, sessions, and signatures that use '
- 'SHA-1 hashing algorithm will be removed in Django 4.0.'
-)
-
class SettingsReference(str):
"""
@@ -164,9 +156,6 @@ class Settings:
setattr(self, setting, setting_value)
self._explicit_settings.add(setting)
- if self.is_overridden('DEFAULT_HASHING_ALGORITHM'):
- warnings.warn(DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG, RemovedInDjango40Warning)
-
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.
@@ -210,8 +199,6 @@ class UserSettingsHolder:
def __setattr__(self, name, value):
self._deleted.discard(name)
- if name == 'DEFAULT_HASHING_ALGORITHM':
- warnings.warn(DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG, RemovedInDjango40Warning)
super().__setattr__(name, value)
def __delattr__(self, name):