diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/contrib/staticfiles.txt | 1 | ||||
| -rw-r--r-- | docs/ref/files/storage.txt | 16 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 38 | ||||
| -rw-r--r-- | docs/releases/1.4.txt | 2 | ||||
| -rw-r--r-- | docs/releases/5.1.txt | 4 | ||||
| -rw-r--r-- | docs/topics/testing/tools.txt | 18 |
6 files changed, 14 insertions, 65 deletions
diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt index 18f5bb4020..298a254d45 100644 --- a/docs/ref/contrib/staticfiles.txt +++ b/docs/ref/contrib/staticfiles.txt @@ -27,7 +27,6 @@ following settings: * :setting:`STATIC_ROOT` * :setting:`STATIC_URL` * :setting:`STATICFILES_DIRS` -* :setting:`STATICFILES_STORAGE` * :setting:`STATICFILES_FINDERS` Management Commands diff --git a/docs/ref/files/storage.txt b/docs/ref/files/storage.txt index afc2476e85..1b38fb696e 100644 --- a/docs/ref/files/storage.txt +++ b/docs/ref/files/storage.txt @@ -25,22 +25,6 @@ Django provides convenient ways to access the default storage class: :data:`~django.core.files.storage.default_storage` is an instance of the :class:`~django.core.files.storage.DefaultStorage`. -.. function:: get_storage_class(import_path=None) - - Returns a class or module which implements the storage API. - - When called without the ``import_path`` parameter ``get_storage_class`` - will return the default storage system as defined by ``default`` key in - :setting:`STORAGES`. If ``import_path`` is provided, ``get_storage_class`` - will attempt to import the class or module from the given path and will - return it if successful. An exception will be raised if the import is - unsuccessful. - - .. deprecated:: 4.2 - - The ``get_storage_class()`` function is deprecated. Use - :data:`storages` instead - The ``FileSystemStorage`` class =============================== diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 5f8395563d..f9dac0f95a 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1329,22 +1329,6 @@ Default exception reporter filter class to be used if none has been assigned to the :class:`~django.http.HttpRequest` instance yet. See :ref:`Filtering error reports<filtering-error-reports>`. -.. setting:: DEFAULT_FILE_STORAGE - -``DEFAULT_FILE_STORAGE`` ------------------------- - -Default: ``'``:class:`django.core.files.storage.FileSystemStorage`\ ``'`` - -Default file storage class to be used for any file-related operations that don't -specify a particular storage system. See :doc:`/topics/files`. - -.. deprecated:: 4.2 - - This setting is deprecated. Starting with Django 4.2, default file storage - engine can be configured with the :setting:`STORAGES` setting under the - ``default`` key. - .. setting:: DEFAULT_FROM_EMAIL ``DEFAULT_FROM_EMAIL`` @@ -3548,27 +3532,6 @@ This would allow you to refer to the local file <a href="{% static 'downloads/polls_20101022.tar.gz' %}"> -.. setting:: STATICFILES_STORAGE - -``STATICFILES_STORAGE`` ------------------------ - -Default: ``'django.contrib.staticfiles.storage.StaticFilesStorage'`` - -The file storage engine to use when collecting static files with the -:djadmin:`collectstatic` management command. - -A ready-to-use instance of the storage backend defined in this setting -can be found under ``staticfiles`` key in ``django.core.files.storage.storages``. - -For an example, see :ref:`staticfiles-from-cdn`. - -.. deprecated:: 4.2 - - This setting is deprecated. Starting with Django 4.2, static files storage - engine can be configured with the :setting:`STORAGES` setting under the - ``staticfiles`` key. - .. setting:: STATICFILES_FINDERS ``STATICFILES_FINDERS`` @@ -3660,7 +3623,6 @@ Error reporting File uploads ------------ -* :setting:`DEFAULT_FILE_STORAGE` * :setting:`FILE_UPLOAD_HANDLERS` * :setting:`FILE_UPLOAD_MAX_MEMORY_SIZE` * :setting:`FILE_UPLOAD_PERMISSIONS` diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt index 6c443fa3c5..7f4aca8f28 100644 --- a/docs/releases/1.4.txt +++ b/docs/releases/1.4.txt @@ -466,7 +466,7 @@ more details. The :mod:`staticfiles<django.contrib.staticfiles>` contrib app has a new ``static`` template tag to refer to files saved with the -:setting:`STATICFILES_STORAGE` storage backend. It uses the storage backend's +``STATICFILES_STORAGE`` storage backend. It uses the storage backend's ``url`` method and therefore supports advanced features such as :ref:`serving files from a cloud service<staticfiles-from-cdn>`. diff --git a/docs/releases/5.1.txt b/docs/releases/5.1.txt index b365020d29..77cb9fbfc7 100644 --- a/docs/releases/5.1.txt +++ b/docs/releases/5.1.txt @@ -280,3 +280,7 @@ to remove usage of these features. * Support for passing positional arguments to ``Signer`` and ``TimestampSigner`` is removed. + +* The ``DEFAULT_FILE_STORAGE`` and ``STATICFILES_STORAGE`` settings is removed. + +* The ``django.core.files.storage.get_storage_class()`` function is removed. diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt index b8d44a3237..89c914a864 100644 --- a/docs/topics/testing/tools.txt +++ b/docs/topics/testing/tools.txt @@ -1497,15 +1497,15 @@ when settings are changed. Django itself uses this signal to reset various data: -============================================================================ ======================== -Overridden settings Data reset -============================================================================ ======================== -USE_TZ, TIME_ZONE Databases timezone -TEMPLATES Template engines -SERIALIZATION_MODULES Serializers cache -LOCALE_PATHS, LANGUAGE_CODE Default translation and loaded translations -DEFAULT_FILE_STORAGE, STATICFILES_STORAGE, STATIC_ROOT, STATIC_URL, STORAGES Storages configuration -============================================================================ ======================== +================================= ======================== +Overridden settings Data reset +================================= ======================== +USE_TZ, TIME_ZONE Databases timezone +TEMPLATES Template engines +SERIALIZATION_MODULES Serializers cache +LOCALE_PATHS, LANGUAGE_CODE Default translation and loaded translations +STATIC_ROOT, STATIC_URL, STORAGES Storages configuration +================================= ======================== Isolating apps -------------- |