Deprecated django.utils.dictconfig.

The module still exists for whoever uses it in its current state, but it
isn't imported by Django anywhere.
This commit is contained in:
Aymeric Augustin 2013-07-01 22:50:58 +02:00
parent e021b87c00
commit 72c65fea41
6 changed files with 15 additions and 16 deletions

View File

@ -562,7 +562,7 @@ MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'
########### ###########
# The callable to use to configure logging # The callable to use to configure logging
LOGGING_CONFIG = 'django.utils.log.dictConfig' LOGGING_CONFIG = 'logging.config.dictConfig'
# Custom logging configuration. # Custom logging configuration.
LOGGING = {} LOGGING = {}

View File

@ -1,3 +1,8 @@
import warnings
warnings.warn("django.utils.dictconfig will be removed in Django 1.9.",
PendingDeprecationWarning, stacklevel=2)
# This is a copy of the Python logging.config.dictconfig module, # This is a copy of the Python logging.config.dictconfig module,
# reproduced with permission. It is provided here for backwards # reproduced with permission. It is provided here for backwards
# compatibility for Python versions prior to 2.7. # compatibility for Python versions prior to 2.7.

View File

@ -16,12 +16,7 @@ except ImportError:
def emit(self, record): def emit(self, record):
pass pass
# Make sure that dictConfig is available from logging.config import dictConfig
# This was added in Python 2.7/3.2
try:
from logging.config import dictConfig
except ImportError:
from django.utils.dictconfig import dictConfig
getLogger = logging.getLogger getLogger = logging.getLogger

View File

@ -410,6 +410,8 @@ these changes.
1.9 1.9
--- ---
* ``django.utils.dictconfig`` will be removed.
* ``django.utils.unittest`` will be removed. * ``django.utils.unittest`` will be removed.
2.0 2.0

View File

@ -31,6 +31,12 @@ Backwards incompatible changes in 1.7
Features deprecated in 1.7 Features deprecated in 1.7
========================== ==========================
``django.utils.dictconfig``
~~~~~~~~~~~~~~~~~~~~~~~~~~~
``django.utils.dictconfig`` was a copy of :mod:`logging.config` provided for
Python versions prior to 2.7. It has been deprecated.
``django.utils.unittest`` ``django.utils.unittest``
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~

View File

@ -205,13 +205,6 @@ Python's logging library provides several techniques to configure
logging, ranging from a programmatic interface to configuration files. logging, ranging from a programmatic interface to configuration files.
By default, Django uses the `dictConfig format`_. By default, Django uses the `dictConfig format`_.
.. note::
``logging.dictConfig`` is a builtin library in Python 2.7. In
order to make this library available for users of earlier Python
versions, Django includes a copy as part of ``django.utils.log``.
If you have Python 2.7 or later, the system native library will be used; if
you have Python 2.6, Django's copy will be used.
In order to configure logging, you use :setting:`LOGGING` to define a In order to configure logging, you use :setting:`LOGGING` to define a
dictionary of logging settings. These settings describes the loggers, dictionary of logging settings. These settings describes the loggers,
handlers, filters and formatters that you want in your logging setup, handlers, filters and formatters that you want in your logging setup,
@ -234,8 +227,6 @@ use in your project code.
.. _dictConfig format: http://docs.python.org/library/logging.config.html#configuration-dictionary-schema .. _dictConfig format: http://docs.python.org/library/logging.config.html#configuration-dictionary-schema
.. _a third-party library: http://bitbucket.org/vinay.sajip/dictconfig
An example An example
---------- ----------