diff options
Diffstat (limited to 'django/conf')
| -rw-r--r-- | django/conf/__init__.py | 11 | ||||
| -rw-r--r-- | django/conf/global_settings.py | 5 |
2 files changed, 0 insertions, 16 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 3d1d65c44d..ea63a0dfb2 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -24,12 +24,6 @@ DEFAULT_STORAGE_ALIAS = "default" STATICFILES_STORAGE_ALIAS = "staticfiles" # RemovedInDjango50Warning -USE_DEPRECATED_PYTZ_DEPRECATED_MSG = ( - "The USE_DEPRECATED_PYTZ setting, and support for pytz timezones is " - "deprecated in favor of the stdlib zoneinfo module. Please update your " - "code to use zoneinfo and remove the USE_DEPRECATED_PYTZ setting." -) - CSRF_COOKIE_MASKED_DEPRECATED_MSG = ( "The CSRF_COOKIE_MASKED transitional setting is deprecated. Support for " "it will be removed in Django 5.0." @@ -217,9 +211,6 @@ class Settings: setattr(self, setting, setting_value) self._explicit_settings.add(setting) - if self.is_overridden("USE_DEPRECATED_PYTZ"): - warnings.warn(USE_DEPRECATED_PYTZ_DEPRECATED_MSG, RemovedInDjango50Warning) - if self.is_overridden("CSRF_COOKIE_MASKED"): warnings.warn(CSRF_COOKIE_MASKED_DEPRECATED_MSG, RemovedInDjango50Warning) @@ -294,8 +285,6 @@ class UserSettingsHolder: } warnings.warn(STATICFILES_STORAGE_DEPRECATED_MSG, RemovedInDjango51Warning) super().__setattr__(name, value) - if name == "USE_DEPRECATED_PYTZ": - warnings.warn(USE_DEPRECATED_PYTZ_DEPRECATED_MSG, RemovedInDjango50Warning) # RemovedInDjango51Warning. if name == "STORAGES": self.STORAGES.setdefault( diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 411a5a4fe2..6d4ea3db5c 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -43,11 +43,6 @@ TIME_ZONE = "America/Chicago" # If you set this to True, Django will use timezone-aware datetimes. USE_TZ = True -# RemovedInDjango50Warning: It's a transitional setting helpful in migrating -# from pytz tzinfo to ZoneInfo(). Set True to continue using pytz tzinfo -# objects during the Django 4.x release cycle. -USE_DEPRECATED_PYTZ = False - # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGE_CODE = "en-us" |