diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/settings.txt | 15 | ||||
| -rw-r--r-- | docs/releases/4.0.txt | 4 | ||||
| -rw-r--r-- | docs/releases/5.0.txt | 4 | ||||
| -rw-r--r-- | docs/topics/i18n/timezones.txt | 2 |
4 files changed, 6 insertions, 19 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index f315e5ef6c..109cc887f7 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2849,21 +2849,6 @@ the correct environment. .. _list of time zones: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones -.. setting:: USE_DEPRECATED_PYTZ - -``USE_DEPRECATED_PYTZ`` ------------------------ - -Default: ``False`` - -A boolean that specifies whether to use ``pytz``, rather than :mod:`zoneinfo`, -as the default time zone implementation. - -.. deprecated:: 4.0 - - This transitional setting is deprecated. Support for using ``pytz`` will be - removed in Django 5.0. - .. setting:: USE_I18N ``USE_I18N`` diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt index d64e74941c..74dd4dbb93 100644 --- a/docs/releases/4.0.txt +++ b/docs/releases/4.0.txt @@ -53,7 +53,7 @@ However, if you are working with non-UTC time zones, and using the ``pytz`` <DATABASE-TIME_ZONE>` setting, you will need to audit your code, since ``pytz`` and ``zoneinfo`` are not entirely equivalent. -To give time for such an audit, the transitional :setting:`USE_DEPRECATED_PYTZ` +To give time for such an audit, the transitional ``USE_DEPRECATED_PYTZ`` setting allows continued use of ``pytz`` during the 4.x release cycle. This setting will be removed in Django 5.0. @@ -62,7 +62,7 @@ author, can be used to assist with the migration from ``pytz``. This package provides shims to help you safely remove ``pytz``, and has a detailed `migration guide`_ showing how to move to the new ``zoneinfo`` APIs. -Using `pytz_deprecation_shim`_ and the :setting:`USE_DEPRECATED_PYTZ` +Using `pytz_deprecation_shim`_ and the ``USE_DEPRECATED_PYTZ`` transitional setting is recommended if you need a gradual update path. .. _pytz_deprecation_shim: https://pytz-deprecation-shim.readthedocs.io/en/latest/index.html diff --git a/docs/releases/5.0.txt b/docs/releases/5.0.txt index 07ab33c439..f137c27398 100644 --- a/docs/releases/5.0.txt +++ b/docs/releases/5.0.txt @@ -276,6 +276,10 @@ to remove usage of these features. * The ``USE_L10N`` setting is removed. +* The ``USE_DEPRECATED_PYTZ`` transitional setting is removed. + +* Support for ``pytz`` timezones is removed. + See :ref:`deprecated-features-4.1` for details on these changes, including how to remove usage of these features. diff --git a/docs/topics/i18n/timezones.txt b/docs/topics/i18n/timezones.txt index c0063eb12d..10170fcdea 100644 --- a/docs/topics/i18n/timezones.txt +++ b/docs/topics/i18n/timezones.txt @@ -677,5 +677,3 @@ Usage :func:`zoneinfo.available_timezones` provides the set of all valid keys for IANA time zones available to your system. See the docs for usage considerations. - -.. _pytz: http://pytz.sourceforge.net/ |