summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-07-01 22:50:58 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-07-01 22:50:58 +0200
commit72c65fea41a6a01f24e134e7627417d94746291a (patch)
tree84c277f611f48bd6293112c0e5e63cd6e6e3949e /docs
parente021b87c0009c11aa2e62b62fc40b4b0209a8e5d (diff)
Deprecated django.utils.dictconfig.
The module still exists for whoever uses it in its current state, but it isn't imported by Django anywhere.
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt2
-rw-r--r--docs/releases/1.7.txt6
-rw-r--r--docs/topics/logging.txt9
3 files changed, 8 insertions, 9 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 7503506ecc..b0f5566cb3 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -410,6 +410,8 @@ these changes.
1.9
---
+* ``django.utils.dictconfig`` will be removed.
+
* ``django.utils.unittest`` will be removed.
2.0
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 2707b2896e..6955ef2030 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -31,6 +31,12 @@ Backwards incompatible changes 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``
~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt
index a88201ad47..e2e68a61a1 100644
--- a/docs/topics/logging.txt
+++ b/docs/topics/logging.txt
@@ -205,13 +205,6 @@ Python's logging library provides several techniques to configure
logging, ranging from a programmatic interface to configuration files.
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
dictionary of logging settings. These settings describes the loggers,
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
-.. _a third-party library: http://bitbucket.org/vinay.sajip/dictconfig
-
An example
----------