Ticket #17778: #17778-RequestContext_pollutes_namespace.patch

django/template/base.py

@@ -5 +5 @@
 from inspect import getargspec
 
 from django.conf import settings
-from django.template.context import (Context, RequestContext,
+from django.template.context import (BaseContext, Context, RequestContext,
     ContextPopException)
 from django.utils.importlib import import_module
 from django.utils.itercompat import is_iterable
@@ -765 +765 @@
                     current = current[bit]
                 except (TypeError, AttributeError, KeyError, ValueError):
                     try:  # attribute lookup
+                        # Don't return class attributes  if the class is the context:
+                        if (isinstance(current, BaseContext) and 
+                            getattr(type(current), bit)):
+                            raise AttributeError
                         current = getattr(current, bit)
                     except (TypeError, AttributeError):
                         try:  # list-index lookup

tests/regressiontests/templates/context.py

@@ -1 +1 @@
 # coding: utf-8
-from django.template import Context
+from django.template import Context, Variable, VariableDoesNotExist
 from django.utils.unittest import TestCase
 
 
 class ContextTests(TestCase):
+
     def test_context(self):
         c = Context({"a": 1, "b": "xyzzy"})
         self.assertEqual(c["a"], 1)
@@ -14 +15 @@
         self.assertEqual(c.pop(), {"a": 2})
         self.assertEqual(c["a"], 1)
         self.assertEqual(c.get("foo", 42), 42)
+
+    def test_resolve_on_context_method(self):
+        # Regression test for #17778
+        empty_context = Context()
+        self.assertRaises(VariableDoesNotExist,
+                Variable('no_such_variable').resolve, empty_context)
+        self.assertRaises(VariableDoesNotExist,
+                Variable('new').resolve, empty_context)
+