fix #19

src/zope/tales/tales.py

@@ -744,12 +744,7 @@ def setGlobal(self, name, value):
             vars[name] = value
 
     def getValue(self, name, default=None):
-        value = default
-        for vars in self._vars_stack:
-            value = vars.get(name, default)
-            if value is not default:
-                break
-        return value
+        return self.vars.get(name, default)
 
     def setRepeat(self, name, expr):
         expr = self.evaluate(expr)

src/zope/tales/tests/test_tales.py

@@ -134,21 +134,27 @@ def testVariables(self):
 
         c = ctxt.vars
         self.assertEqual(c['v1'], 1, 'Variable "v1"')
+        self.assertEqual(ctxt.getValue('v1'), 1, 'Variable "v1"')
 
         ctxt.beginScope()
         ctxt.setLocal('v1', 3)
         ctxt.setGlobal('g', 1)
 
         c = ctxt.vars
         self.assertEqual(c['v1'], 3, 'Inner scope')
+        self.assertEqual(ctxt.getValue('v1'), 3, 'Inner scope')
         self.assertEqual(c['v2'], 2, 'Outer scope')
+        self.assertEqual(ctxt.getValue('v2'), 2, 'Outer scope')
         self.assertEqual(c['g'], 1, 'Global')
+        self.assertEqual(ctxt.getValue('g'), 1, 'Global')
 
         ctxt.endScope()
 
         c = ctxt.vars
         self.assertEqual(c['v1'], 1, "Uncovered local")
+        self.assertEqual(ctxt.getValue('v1'), 1, "Uncovered local")
         self.assertEqual(c['g'], 1, "Global from inner scope")
+        self.assertEqual(ctxt.getValue('g'), 1, "Global from inner scope")
 
         ctxt.endScope()
 
@@ -220,7 +226,7 @@ def test_getValue_nested(self):
         self.context.vars['it'] = 1
         self.context.beginScope()
         self.context.vars['it'] = 2
-        self.assertEqual(self.context.getValue('it'), 1)
+        self.assertEqual(self.context.getValue('it'), 2)
 
     def test_evaluate_boolean(self):
         # Make sure it always returns a regular bool, no matter