diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 596f4ae78a..bf0dea558a 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -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 = {} diff --git a/django/utils/dictconfig.py b/django/utils/dictconfig.py index c7b39819b5..ed1440ce11 100644 --- a/django/utils/dictconfig.py +++ b/django/utils/dictconfig.py @@ -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, # reproduced with permission. It is provided here for backwards # compatibility for Python versions prior to 2.7. diff --git a/django/utils/log.py b/django/utils/log.py index 6734a7261e..cb33378c07 100644 --- a/django/utils/log.py +++ b/django/utils/log.py @@ -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 +from logging.config import dictConfig getLogger = logging.getLogger 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 ----------