summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/template/loader.py4
-rw-r--r--docs/releases/1.8.txt5
2 files changed, 3 insertions, 6 deletions
diff --git a/django/template/loader.py b/django/template/loader.py
index f27494dfb1..87a9789b31 100644
--- a/django/template/loader.py
+++ b/django/template/loader.py
@@ -75,10 +75,6 @@ def select_template(template_name_list, dirs=_dirs_undefined, using=None):
raise TemplateDoesNotExist("No template names provided")
-def get_template_from_string(*args, **kwargs):
- return Engine.get_default().from_string(*args, **kwargs)
-
-
def render_to_string(*args, **kwargs):
return Engine.get_default().render_to_string(*args, **kwargs)
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 3ebdebbea0..8bf3659ba2 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -838,8 +838,9 @@ Cleanup of the ``django.template`` namespace
If you've been relying on private APIs exposed in the ``django.template``
module, you may have to import them from ``django.template.base`` instead.
-Also private APIs ``django.template.base.compile_string()`` and
-``django.template.loader.find_template()`` were removed.
+Also private APIs ``django.template.base.compile_string()``,
+``django.template.loader.find_template()``, and
+``django.template.loader.get_template_from_string()`` were removed.
Miscellaneous
~~~~~~~~~~~~~