genshi/genshi-test: genshi/template/text.py comparison

comparison genshi/template/text.py @ 902:09cc3627654c experimental-inline

Sync `experimental/inline` branch with [source:trunk@1126].

author	cmlenz
date	Fri, 23 Apr 2010 21:08:26 +0000
parents	1837f39efd6f
children

comparison

equal deleted inserted replaced

-:de82830f8816
+:09cc3627654c
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006-2008 Edgewall Software
+# Copyright (C) 2006-2009 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
 # are also available at http://genshi.edgewall.org/wiki/License.
 ... We have the following items for you:
 ... {% for item in items %}
 ...  * ${'Item %d' % item}
 ... {% end %}
 ... ''')
->>> print tmpl.generate(name='Joe', items=[1, 2, 3]).render()
+>>> print(tmpl.generate(name='Joe', items=[1, 2, 3]).render(encoding=None))
 Dear Joe,
 <BLANKLINE>
 <BLANKLINE>
 We have the following items for you:
 <BLANKLINE>
 ... We have the following items for you:
 ... {% for item in items %}\
 ...  * $item
 ... {% end %}\
 ... ''')
->>> print tmpl.generate(name='Joe', items=[1, 2, 3]).render()
+>>> print(tmpl.generate(name='Joe', items=[1, 2, 3]).render(encoding=None))
 Dear Joe,
 <BLANKLINE>
 We have the following items for you:
 * 1
 * 2
 ... We have the following items for you:
 ... {% for item in items %}\
 ...  * $item
 ... {% end %}\
 ... ''')
->>> print tmpl.generate(name='Joe', items=[1, 2, 3]).render()
+>>> print(tmpl.generate(name='Joe', items=[1, 2, 3]).render(encoding=None))
 Dear Joe,
 <BLANKLINE>
 {# This is a comment #}
 We have the following items for you:
 * 1
 def _set_delims(self, delims):
 if len(delims) != 4:
 raise ValueError('delimiers tuple must have exactly four elements')
 self._delims = delims
 self._directive_re = re.compile(self._DIRECTIVE_RE % tuple(
-map(re.escape, delims)
+[re.escape(d) for d in delims]
 ), re.DOTALL)
 self._escape_re = re.compile(self._ESCAPE_RE % tuple(
-map(re.escape, delims[::2])
+[re.escape(d) for d in delims[::2]]
 ))
 delimiters = property(_get_delims, _set_delims, """\
 The delimiters for directives and comments. This should be a four item tuple
 of the form ``(directive_start, directive_end, comment_start,
 comment_end)``, where each item is a string.
 offset = 0
 lineno = 1
 _escape_sub = self._escape_re.sub
 def _escape_repl(mo):
-groups = filter(None, mo.groups())
+groups = [g for g in mo.groups() if g]
 if not groups:
 return ''
 return groups[0]
 for idx, mo in enumerate(self._directive_re.finditer(source)):
 elif command:
 cls = self.get_directive(command)
 if cls is None:
 raise BadDirectiveError(command)
-directive = cls, value, None, (self.filepath, lineno, 0)
+directive = 0, cls, value, None, (self.filepath, lineno, 0)
 dirmap[depth] = (directive, len(stream))
 depth += 1
 offset = end
 ...  * $item
 ... #end
 ...
 ... All the best,
 ... Foobar''')
->>> print tmpl.generate(name='Joe', items=[1, 2, 3]).render()
+>>> print(tmpl.generate(name='Joe', items=[1, 2, 3]).render(encoding=None))
 Dear Joe,
 <BLANKLINE>
 We have the following items for you:
 * 1
 * 2
 stream.append((INCLUDE, (value.strip(), None, []), pos))
 elif command != '#':
 cls = self.get_directive(command)
 if cls is None:
 raise BadDirectiveError(command)
-directive = cls, value, None, (self.filepath, lineno, 0)
+directive = 0, cls, value, None, (self.filepath, lineno, 0)
 dirmap[depth] = (directive, len(stream))
 depth += 1
 offset = end

Mercurial > genshi > genshi-test

comparison genshi/template/text.py @ 902:09cc3627654c experimental-inline