diff options
| author | Tim Graham <timograham@gmail.com> | 2015-09-05 08:37:44 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-23 19:31:11 -0400 |
| commit | 4811f09fa39d5293944dfebfbfaf6849828d2dcd (patch) | |
| tree | 926c6746ea9f91b8f53f3af8a14324e19d708c21 /django/template/engine.py | |
| parent | 2a20ebe6a5b6606f99091530067cca05fb7ce853 (diff) | |
Removed template.loader.BaseLoader per deprecation timeline.
Diffstat (limited to 'django/template/engine.py')
| -rw-r--r-- | django/template/engine.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/django/template/engine.py b/django/template/engine.py index ec89b8d7ef..dc049dd246 100644 --- a/django/template/engine.py +++ b/django/template/engine.py @@ -1,8 +1,5 @@ -import warnings - from django.core.exceptions import ImproperlyConfigured from django.utils import lru_cache, six -from django.utils.deprecation import RemovedInDjango110Warning from django.utils.functional import cached_property from django.utils.module_loading import import_string @@ -122,16 +119,7 @@ class Engine(object): if isinstance(loader, six.string_types): loader_class = import_string(loader) - - if getattr(loader_class, '_accepts_engine_in_init', False): - args.insert(0, self) - else: - warnings.warn( - "%s inherits from django.template.loader.BaseLoader " - "instead of django.template.loaders.base.Loader. " % - loader, RemovedInDjango110Warning, stacklevel=2) - - return loader_class(*args) + return loader_class(self, *args) else: raise ImproperlyConfigured( "Invalid value in template loaders configuration: %r" % loader) |
