[1.9.x] Fixed #25466 -- Added backwards compatibility aliases for LoaderOrigin and StringOrigin.

Thanks Simon Charette for the DeprecationInstanceCheck class.

Backport of 8d1a001ef6dcbbe8053da05cdb3ec99965b0953f from master

2 files changed, 11 insertions, 1 deletions

diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 8b9ab3254c..d356ecb2f3 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -100,6 +100,10 @@ details on these changes.
 * The ``enclosure`` keyword argument to ``SyndicationFeed.add_item()`` will be
   removed.
 
+* The ``django.template.loader.LoaderOrigin`` and
+  ``django.template.base.StringOrigin`` aliases for
+  ``django.template.base.Origin`` will be removed.
+
 .. _deprecation-removed-in-1.10:
 
 1.10
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index c63ae1c351..1f8a127c4f 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -818,7 +818,9 @@ debug as ``True``, an instance of ``django.template.loader.LoaderOrigin`` or
 ``django.template.base.StringOrigin`` was set as the origin attribute on the
 template object. These classes have been combined into
 :class:`~django.template.base.Origin` and is now always set regardless of the
-engine debug setting.
+engine debug setting. For a minimal level of backwards compatibility, the old
+class names will be kept as aliases to the new ``Origin`` class until
+Django 2.0.
 
 .. _default-logging-changes-19:
 
@@ -1335,6 +1337,10 @@ Miscellaneous
   deprecated. Use the new ``enclosures`` argument which accepts a list of
   ``Enclosure`` objects instead of a single one.
 
+* The ``django.template.loader.LoaderOrigin`` and
+  ``django.template.base.StringOrigin`` aliases for
+  ``django.template.base.Origin`` are deprecated.
+
 .. _removed-features-1.9:
 
 Features removed in 1.9