From 331a48d0984b37dafd07efb2f3883ab6fafb2b34 Mon Sep 17 00:00:00 2001 From: Chris Jerdonek Date: Sun, 6 May 2012 11:40:55 -0700 Subject: ParsedTemplate docstring udpates and removed RenderEngine.render_parsed(). --- pystache/parsed.py | 30 +++++++++--------------------- pystache/parser.py | 4 ++-- pystache/renderengine.py | 5 +---- 3 files changed, 12 insertions(+), 27 deletions(-) (limited to 'pystache') diff --git a/pystache/parsed.py b/pystache/parsed.py index e3c746f..e94c644 100644 --- a/pystache/parsed.py +++ b/pystache/parsed.py @@ -3,39 +3,27 @@ """ Exposes a class that represents a parsed (or compiled) template. -This module is meant only for internal use. - """ class ParsedTemplate(object): def __init__(self): - """ - Arguments: - - parse_tree: a list, each element of which is either-- - - (1) a unicode string, or - (2) a "rendering" callable that accepts a ContextStack instance - and returns a unicode string. - - The possible rendering callables are the return values of the - following functions: - - * RenderEngine._make_get_escaped() - * RenderEngine._make_get_inverse() - * RenderEngine._make_get_literal() - * RenderEngine._make_get_partial() - * RenderEngine._make_get_section() - - """ self._parse_tree = [] def __repr__(self): return repr(self._parse_tree) def add(self, node): + """ + Arguments: + + node: a unicode string or node object instance. A node object + instance must have a `render(engine, stack)` method that + accepts a RenderEngine instance and a ContextStack instance and + returns a unicode string. + + """ self._parse_tree.append(node) def render(self, engine, context): diff --git a/pystache/parser.py b/pystache/parser.py index 0365f76..81d189a 100644 --- a/pystache/parser.py +++ b/pystache/parser.py @@ -166,7 +166,7 @@ class _InvertedNode(object): # per the spec. if data: return u'' - return engine.render_parsed(self.parsed_section, context) + return self.parsed_section.render(engine, context) class _SectionNode(object): @@ -212,7 +212,7 @@ class _SectionNode(object): continue context.push(val) - parts.append(engine.render_parsed(self.parsed, context)) + parts.append(self.parsed.render(engine, context)) context.pop() return unicode(''.join(parts)) diff --git a/pystache/renderengine.py b/pystache/renderengine.py index 9259544..4d69cd1 100644 --- a/pystache/renderengine.py +++ b/pystache/renderengine.py @@ -150,9 +150,6 @@ class RenderEngine(object): val = self.literal(val) return self.render(val, context, delimiters) - def render_parsed(self, parsed_template, context_stack): - return parsed_template.render(self, context_stack) - def render(self, template, context_stack, delimiters=None): """ Render a unicode template string, and return as unicode. @@ -167,4 +164,4 @@ class RenderEngine(object): """ parsed_template = parse(template, delimiters) - return self.render_parsed(parsed_template, context_stack) + return parsed_template.render(self, context_stack) -- cgit v1.2.1