Skip to content

Commit

Permalink
Resolving issues post Django-r12295 commit. No longer needing similar…
Browse files Browse the repository at this point in the history
… path hacks.
  • Loading branch information
David Cramer authored and David Cramer committed Jan 26, 2010
1 parent fa9edd4 commit 32ab9fe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions coffin/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,10 @@ def _get_templatelibs(self):
if f.endswith('.py'):
try:
# TODO: will need updating when #6587 lands
libs.append(get_library(
"django.templatetags.%s" % os.path.splitext(f)[0]))
# libs.append(get_library(
# "django.templatetags.%s" % os.path.splitext(f)[0]))
libs.append(get_library(os.path.splitext(f)[0]))

except InvalidTemplateLibrary:
pass
return libs
Expand Down
4 changes: 2 additions & 2 deletions coffin/template/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.template import (
Context as DjangoContext,
add_to_builtins as django_add_to_builtins,
get_library)
import_library)
from jinja2 import Template as _Jinja2Template

# Merge with ``django.template``.
Expand Down Expand Up @@ -85,7 +85,7 @@ def add_to_builtins(module_name):
Library object is compatible, remember!? We can just add them
directly to Django's own list of builtins.
"""
builtins.append(get_library(module_name))
builtins.append(import_library(module_name))
django_add_to_builtins(module_name)


Expand Down

0 comments on commit 32ab9fe

Please sign in to comment.