Skip to content

Commit

Permalink
Fixed #663 -- app_directories template loader no longer assumes a dot…
Browse files Browse the repository at this point in the history
… in the app name. Thanks, Sune

git-svn-id: http://code.djangoproject.com/svn/django/trunk@985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Oct 20, 2005
1 parent 81cbf27 commit cc3635d
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions django/core/template/loaders/app_directories.py
@@ -1,15 +1,25 @@
# Wrapper for loading templates from "template" directories in installed app packages.

from django.conf.settings import INSTALLED_APPS, TEMPLATE_FILE_EXTENSION
from django.core.exceptions import ImproperlyConfigured
from django.core.template import TemplateDoesNotExist
import os

# At compile time, cache the directories to search.
app_template_dirs = []
for app in INSTALLED_APPS:
i = app.rfind('.')
m, a = app[:i], app[i+1:]
mod = getattr(__import__(m, '', '', [a]), a)
if i == -1:
m, a = app, None
else:
m, a = app[:i], app[i+1:]
try:
if a is None:
mod = __import__(m, '', '', [])
else:
mod = getattr(__import__(m, '', '', [a]), a)
except ImportError, e:
raise ImproperlyConfigured, 'ImportError %s: %s' % (app, e.args[0])
template_dir = os.path.join(os.path.dirname(mod.__file__), 'templates')
if os.path.isdir(template_dir):
app_template_dirs.append(template_dir)
Expand Down

0 comments on commit cc3635d

Please sign in to comment.