Commit 72c65fea authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Deprecated django.utils.dictconfig. 

The module still exists for whoever uses it in its current state, but it
isn't imported by Django anywhere.
parent e021b87c

django/conf/global_settings.py

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage' 
###########



# The callable to use to configure logging

LOGGING_CONFIG = 'django.utils.log.dictConfig'

LOGGING_CONFIG = 'logging.config.dictConfig'



# Custom logging configuration.

LOGGING = {}

django/utils/dictconfig.py

+5 −0
Original line number Diff line number Diff line 
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,

# reproduced with permission. It is provided here for backwards

# compatibility for Python versions prior to 2.7.

django/utils/log.py

+1 −6
Original line number Diff line number Diff line
@@ -16,12 +16,7 @@ except ImportError: 
        def emit(self, record):

            pass



# Make sure that dictConfig is available

# 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

docs/internals/deprecation.txt

+2 −0
Original line number Diff line number Diff line
@@ -410,6 +410,8 @@ these changes. 
1.9

---



* ``django.utils.dictconfig`` will be removed.



* ``django.utils.unittest`` will be removed.



2.0

docs/releases/1.7.txt

+6 −0
Original line number Diff line number Diff line
@@ -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``

~~~~~~~~~~~~~~~~~~~~~~~~~