Skip to content

Commit

Permalink
Clarifications from review.
Browse files Browse the repository at this point in the history
  • Loading branch information
jamadden committed Sep 22, 2017
1 parent 86f4246 commit aaae9b8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[run]
source = zope.tales
omit =
*/flycheck_*py

[report]
precision = 2
Expand Down
18 changes: 12 additions & 6 deletions src/zope/tales/tests/test_expressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,15 +317,17 @@ def check(expr):
def test_defer_expression_returns_wrapper(self):
from zope.tales.expressions import DeferWrapper
from zope.tales.expressions import DeferExpr
expr = self.engine.compile('defer: b')
expr = self.engine.compile('defer: B')
self.assertIsInstance(expr, DeferExpr)
self.assertEqual(str(expr), "<DeferExpr 'b'>")
self.assertEqual(str(expr), "<DeferExpr 'B'>")
self._check_evals_to_instance(expr, DeferWrapper)

wrapper = expr(self.context)
self.assertEqual(wrapper(), self.context.vars['b'])

self.assertEqual(str(wrapper), 'boot')
# It evaluates to what its underlying expression evaluates to
self.assertEqual(wrapper(), self.context.vars['B'])
# The str() of defer is the same as the str() of evaluating it
self.assertEqual(str(wrapper), str(self.context.vars['B']))
self.assertEqual(str(wrapper()), str(self.context.vars['B']))

def test_eval_defer_wrapper(self):
expr = self.engine.compile('defer: b')
Expand All @@ -345,8 +347,12 @@ def test_lazy_expression_returns_wrapper(self):
second_result = lazy()
self.assertIs(first_result, second_result)


def test_not(self):
# self.context is a Data object, not a real
# zope.tales.tales.Context object, and as such
# it doesn't define the evaluateBoolean function that
# not expressions need. Add it locally to avoid disturbing
# other tests.
def evaluateBoolean(expr):
return bool(expr(self.context))
self.context.evaluateBoolean = evaluateBoolean
Expand Down

0 comments on commit aaae9b8

Please sign in to comment.