summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-08-18 10:30:11 -0400
committerTim Graham <timograham@gmail.com>2015-09-23 19:31:09 -0400
commit5c62887d82b1d886c97eb2d4ed3f596b0e6bfebb (patch)
treed4d3250e2c305673e814b8ce84a34a464590b1cb
parent222d0633010e2f37f9fbd2d0559ecc4a5643c738 (diff)
Refs #22933 -- Removed template.resolve_variable() per deprecation timeline.
-rw-r--r--django/template/__init__.py3
-rw-r--r--django/template/base.py15
2 files changed, 0 insertions, 18 deletions
diff --git a/django/template/__init__.py b/django/template/__init__.py
index 63b3d7ba4d..b55b4491c6 100644
--- a/django/template/__init__.py
+++ b/django/template/__init__.py
@@ -61,9 +61,6 @@ from .base import ( # NOQA i
Context, Node, NodeList, Origin, RequestContext, Template, Variable,
)
-# Deprecated in Django 1.8, will be removed in Django 1.10.
-from .base import resolve_variable # NOQA isort:skip
-
# Library management
from .library import Library # NOQA isort:skip
diff --git a/django/template/base.py b/django/template/base.py
index 52586e7ab5..bb2456ad05 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -54,13 +54,11 @@ from __future__ import unicode_literals
import inspect
import logging
import re
-import warnings
from django.template.context import ( # NOQA: imported for backwards compatibility
BaseContext, Context, ContextPopException, RequestContext,
)
from django.utils import six
-from django.utils.deprecation import RemovedInDjango110Warning
from django.utils.encoding import (
force_str, force_text, python_2_unicode_compatible,
)
@@ -747,19 +745,6 @@ class FilterExpression(object):
return self.token
-def resolve_variable(path, context):
- """
- Returns the resolved variable, which may contain attribute syntax, within
- the given context.
-
- Deprecated; use the Variable class instead.
- """
- warnings.warn("resolve_variable() is deprecated. Use django.template."
- "Variable(path).resolve(context) instead",
- RemovedInDjango110Warning, stacklevel=2)
- return Variable(path).resolve(context)
-
-
class Variable(object):
"""
A template variable, resolvable against a given context. The variable may