From 086697b23156222e22476e6c546cff6e76658139 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 2 Feb 2012 17:03:32 +0000 Subject: [PATCH] Fixed loader_tags.py to import token_kwargs from the correct module git-svn-id: http://code.djangoproject.com/svn/django/trunk@17419 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/loader_tags.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py index 521df2dd8d..7451e0b1bf 100644 --- a/django/template/loader_tags.py +++ b/django/template/loader_tags.py @@ -1,6 +1,5 @@ from django.conf import settings -from django.template.base import TemplateSyntaxError, Library, Node, TextNode -from django.template.defaulttags import token_kwargs +from django.template.base import TemplateSyntaxError, Library, Node, TextNode, token_kwargs from django.template.loader import get_template from django.utils.safestring import mark_safe