diff -r b758351d191f -r cc9b7e14412b web/lib/django/template/loaders/eggs.py --- a/web/lib/django/template/loaders/eggs.py Wed May 19 17:43:59 2010 +0200 +++ b/web/lib/django/template/loaders/eggs.py Tue May 25 02:43:45 2010 +0200 @@ -6,20 +6,34 @@ resource_string = None from django.template import TemplateDoesNotExist +from django.template.loader import BaseLoader from django.conf import settings +class Loader(BaseLoader): + is_usable = resource_string is not None + + def load_template_source(self, template_name, template_dirs=None): + """ + Loads templates from Python eggs via pkg_resource.resource_string. + + For every installed app, it tries to get the resource (app, template_name). + """ + if resource_string is not None: + pkg_name = 'templates/' + template_name + for app in settings.INSTALLED_APPS: + try: + return (resource_string(app, pkg_name).decode(settings.FILE_CHARSET), 'egg:%s:%s' % (app, pkg_name)) + except: + pass + raise TemplateDoesNotExist(template_name) + +_loader = Loader() + def load_template_source(template_name, template_dirs=None): - """ - Loads templates from Python eggs via pkg_resource.resource_string. - - For every installed app, it tries to get the resource (app, template_name). - """ - if resource_string is not None: - pkg_name = 'templates/' + template_name - for app in settings.INSTALLED_APPS: - try: - return (resource_string(app, pkg_name).decode(settings.FILE_CHARSET), 'egg:%s:%s' % (app, pkg_name)) - except: - pass - raise TemplateDoesNotExist, template_name + import warnings + warnings.warn( + "'django.template.loaders.eggs.load_template_source' is deprecated; use 'django.template.loaders.eggs.Loader' instead.", + PendingDeprecationWarning + ) + return _loader.load_template_source(template_name, template_dirs) load_template_source.is_usable = resource_string is not None