diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2008-05-29 13:11:23 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2008-05-29 13:11:23 +0000 |
| commit | d53e8f1285247a2a9579f30982086cc495c1098d (patch) | |
| tree | b099a6f84733103c300ea79729297bb09141b894 /django | |
| parent | d4d5f4ce2f3fc27d7680c0d2a920774873232fde (diff) | |
Fixed #6430 -- Corrected the loading of templates from eggs, which was broken by the unicode merge. Thanks for the excellent report and patch, Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/template/loaders/eggs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/loaders/eggs.py b/django/template/loaders/eggs.py index 0c68153917..946c2b4759 100644 --- a/django/template/loaders/eggs.py +++ b/django/template/loaders/eggs.py @@ -18,7 +18,7 @@ def load_template_source(template_name, template_dirs=None): pkg_name = 'templates/' + template_name for app in settings.INSTALLED_APPS: try: - return (resource_string(app, pkg_name), 'egg:%s:%s ' % (app, pkg_name)).decode(settings.FILE_CHARSET) + return (resource_string(app, pkg_name).decode(settings.FILE_CHARSET), 'egg:%s:%s' % (app, pkg_name)) except: pass raise TemplateDoesNotExist, template_name |