Moved context_processors from django.core to django.template. (92e8f1f3) · Commits · Dom Sekotill / django

django/conf/global_settings.py

+6 −6

Original line number	Diff line number	Diff line
		@@ -218,12 +218,12 @@ TEMPLATE_LOADERS = (
		# only parameter and returns a dictionary to add to the context.
		TEMPLATE_CONTEXT_PROCESSORS = (
		'django.contrib.auth.context_processors.auth',
		'django.core.context_processors.debug',
		'django.core.context_processors.i18n',
		'django.core.context_processors.media',
		'django.core.context_processors.static',
		'django.core.context_processors.tz',
		# 'django.core.context_processors.request',
		'django.template.context_processors.debug',
		'django.template.context_processors.i18n',
		'django.template.context_processors.media',
		'django.template.context_processors.static',
		'django.template.context_processors.tz',
		# 'django.template.context_processors.request',
		'django.contrib.messages.context_processors.messages',
		)

django/conf/project_template/project_name/settings.py

+5 −5

Original line number	Diff line number	Diff line
		@@ -60,11 +60,11 @@ TEMPLATES = [
		'APP_DIRS': True,
		'OPTIONS': {
		'context_processors': [
		'django.core.context_processors.debug',
		'django.core.context_processors.i18n',
		'django.core.context_processors.tz',
		'django.core.context_processors.media',
		'django.core.context_processors.static',
		'django.template.context_processors.debug',
		'django.template.context_processors.i18n',
		'django.template.context_processors.tz',
		'django.template.context_processors.media',
		'django.template.context_processors.static',
		'django.contrib.auth.context_processors.auth',
		'django.contrib.messages.context_processors.messages',
		],

django/core/context_processors.py

+7 −82

Original line number	Diff line number	Diff line
		"""
		A set of request processors that return dictionaries to be merged into a
		template context. Each function takes the request object as its only parameter
		and returns a dictionary to add to the context.
		import warnings

		These are referenced from the setting TEMPLATE_CONTEXT_PROCESSORS and used by
		RequestContext.
		"""
		from __future__ import unicode_literals
		from django.template.context_processors import * # NOQA
		from django.utils.deprecation import RemovedInDjango20Warning

		from django.conf import settings
		from django.middleware.csrf import get_token
		from django.utils import six
		from django.utils.encoding import smart_text
		from django.utils.functional import lazy


		def csrf(request):
		"""
		Context processor that provides a CSRF token, or the string 'NOTPROVIDED' if
		it has not been provided by either a view decorator or the middleware
		"""
		def _get_val():
		token = get_token(request)
		if token is None:
		# In order to be able to provide debugging info in the
		# case of misconfiguration, we use a sentinel value
		# instead of returning an empty dict.
		return 'NOTPROVIDED'
		else:
		return smart_text(token)
		_get_val = lazy(_get_val, six.text_type)

		return {'csrf_token': _get_val()}


		def debug(request):
		"""
		Returns context variables helpful for debugging.
		"""
		context_extras = {}
		if settings.DEBUG and request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS:
		context_extras['debug'] = True
		from django.db import connection
		# Return a lazy reference that computes connection.queries on access,
		# to ensure it contains queries triggered after this function runs.
		context_extras['sql_queries'] = lazy(lambda: connection.queries, list)
		return context_extras


		def i18n(request):
		from django.utils import translation

		context_extras = {}
		context_extras['LANGUAGES'] = settings.LANGUAGES
		context_extras['LANGUAGE_CODE'] = translation.get_language()
		context_extras['LANGUAGE_BIDI'] = translation.get_language_bidi()

		return context_extras


		def tz(request):
		from django.utils import timezone

		return {'TIME_ZONE': timezone.get_current_timezone_name()}


		def static(request):
		"""
		Adds static-related context variables to the context.

		"""
		return {'STATIC_URL': settings.STATIC_URL}


		def media(request):
		"""
		Adds media-related context variables to the context.

		"""
		return {'MEDIA_URL': settings.MEDIA_URL}


		def request(request):
		return {'request': request}
		warnings.warn(
		"django.core.context_processors is deprecated in favor of "
		"django.template.context_processors.",
		RemovedInDjango20Warning, stacklevel=2)

django/template/context.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ from copy import copy


		# Hard-coded processor for easier use of CSRF protection.
		_builtin_context_processors = ('django.core.context_processors.csrf',)
		_builtin_context_processors = ('django.template.context_processors.csrf',)


		class ContextPopException(Exception):

django/template/context_processors.py

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		"""
		A set of request processors that return dictionaries to be merged into a
		template context. Each function takes the request object as its only parameter
		and returns a dictionary to add to the context.

		These are referenced from the setting TEMPLATE_CONTEXT_PROCESSORS and used by
		RequestContext.
		"""
		from __future__ import unicode_literals

		from django.conf import settings
		from django.middleware.csrf import get_token
		from django.utils import six
		from django.utils.encoding import smart_text
		from django.utils.functional import lazy


		def csrf(request):
		"""
		Context processor that provides a CSRF token, or the string 'NOTPROVIDED' if
		it has not been provided by either a view decorator or the middleware
		"""
		def _get_val():
		token = get_token(request)
		if token is None:
		# In order to be able to provide debugging info in the
		# case of misconfiguration, we use a sentinel value
		# instead of returning an empty dict.
		return 'NOTPROVIDED'
		else:
		return smart_text(token)
		_get_val = lazy(_get_val, six.text_type)

		return {'csrf_token': _get_val()}


		def debug(request):
		"""
		Returns context variables helpful for debugging.
		"""
		context_extras = {}
		if settings.DEBUG and request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS:
		context_extras['debug'] = True
		from django.db import connection
		# Return a lazy reference that computes connection.queries on access,
		# to ensure it contains queries triggered after this function runs.
		context_extras['sql_queries'] = lazy(lambda: connection.queries, list)
		return context_extras


		def i18n(request):
		from django.utils import translation

		context_extras = {}
		context_extras['LANGUAGES'] = settings.LANGUAGES
		context_extras['LANGUAGE_CODE'] = translation.get_language()
		context_extras['LANGUAGE_BIDI'] = translation.get_language_bidi()

		return context_extras


		def tz(request):
		from django.utils import timezone

		return {'TIME_ZONE': timezone.get_current_timezone_name()}


		def static(request):
		"""
		Adds static-related context variables to the context.

		"""
		return {'STATIC_URL': settings.STATIC_URL}


		def media(request):
		"""
		Adds media-related context variables to the context.

		"""
		return {'MEDIA_URL': settings.MEDIA_URL}


		def request(request):
		return {'request': request}