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

comparison genshi/template/eval.py @ 934:7c9ec79caedc

Merge r1142 from py3k: add support for python 3 to genshi.template expression evaluator: * add support for python 3 AST: * AST for raise has changed in Python 3. * Python 3 adds AST nodes for individual arguments and Bytes. * use genshi.compat functions for dealing with code objects. * do not coerce byte strings to unicode in Python 3 ASTTransformer. * replace doctests that reply on exception names with uglier but more compatible try:.. except:.. doctest * handle filename preferences of Python 2 and 3 (2 prefers bytes, 3 prefers unicode). * ifilter is gone from itertools in Python 3 so use repeat for tests instead.

author	hodgestar
date	Fri, 18 Mar 2011 09:15:29 +0000
parents	85e4678337cf
children

comparison

equal deleted inserted replaced

-:feba07fc925b
+:7c9ec79caedc
 from genshi.core import Markup
 from genshi.template.astutil import ASTTransformer, ASTCodeGenerator, \
 _ast, parse
 from genshi.template.base import TemplateRuntimeError
 from genshi.util import flatten
+from genshi.compat import get_code_params, build_code_chunk, IS_PYTHON2
 __all__ = ['Code', 'Expression', 'Suite', 'LenientLookup', 'StrictLookup',
 'Undefined', 'UndefinedError']
 __docformat__ = 'restructuredtext en'
 self._globals = lookup.globals
 def __getstate__(self):
 state = {'source': self.source, 'ast': self.ast,
 'lookup': self._globals.im_self}
-c = self.code
+state['code'] = get_code_params(self.code)
-state['code'] = (c.co_nlocals, c.co_stacksize, c.co_flags, c.co_code,
-c.co_consts, c.co_names, c.co_varnames, c.co_filename,
-c.co_name, c.co_firstlineno, c.co_lnotab, (), ())
 return state
 def __setstate__(self, state):
 self.source = state['source']
 self.ast = state['ast']
 However, calling an undefined variable, or trying to access an attribute
 of that variable, will raise an exception that includes the name used to
 reference that undefined variable.
->>> foo('bar')
+>>> try:
-Traceback (most recent call last):
+...     foo('bar')
-...
+... except UndefinedError, e:
-UndefinedError: "foo" not defined
+...     print e.msg
+"foo" not defined
->>> foo.bar
-Traceback (most recent call last):
+>>> try:
-...
+...     foo.bar
-UndefinedError: "foo" not defined
+... except UndefinedError, e:
+...     print e.msg
+"foo" not defined
 :see: `LenientLookup`
 """
 __slots__ = ['_name', '_owner']
 Referencing an undefined variable using this lookup style will immediately
 raise an ``UndefinedError``:
 >>> expr = Expression('nothing', lookup='strict')
->>> expr.evaluate({})
+>>> try:
-Traceback (most recent call last):
+...     expr.evaluate({})
-...
+... except UndefinedError, e:
-UndefinedError: "nothing" not defined
+...     print e.msg
+"nothing" not defined
 The same happens when a non-existing attribute or item is accessed on an
 existing object:
 >>> expr = Expression('something.nil', lookup='strict')
->>> expr.evaluate({'something': dict()})
+>>> try:
-Traceback (most recent call last):
+...     expr.evaluate({'something': dict()})
-...
+... except UndefinedError, e:
-UndefinedError: {} has no member named "nil"
+...     print e.msg
+{} has no member named "nil"
 """
 @classmethod
 def undefined(cls, key, owner=UNDEFINED):
 """Raise an ``UndefinedError`` immediately."""
 rest = dedent('\n'.join(lines[1:])).rstrip()
 if first.rstrip().endswith(':') and not rest[0].isspace():
 rest = '\n'.join(['    %s' % line for line in rest.splitlines()])
 source = '\n'.join([first, rest])
 if isinstance(source, unicode):
-source = '\xef\xbb\xbf' + source.encode('utf-8')
+source = (u'\ufeff' + source).encode('utf-8')
 return parse(source, mode)
 def _compile(node, source=None, mode='eval', filename=None, lineno=-1,
 xform=None):
-if isinstance(filename, unicode):
+if not filename:
-# unicode file names not allowed for code objects
-filename = filename.encode('utf-8', 'replace')
-elif not filename:
 filename = '<string>'
+if IS_PYTHON2:
+# Python 2 requires non-unicode filenames
+if isinstance(filename, unicode):
+filename = filename.encode('utf-8', 'replace')
+else:
+# Python 3 requires unicode filenames
+if not isinstance(filename, unicode):
+filename = filename.decode('utf-8', 'replace')
 if lineno <= 0:
 lineno = 1
 if xform is None:
 xform = {
 code = compile(new_source, filename, mode)
 try:
 # We'd like to just set co_firstlineno, but it's readonly. So we need
 # to clone the code object while adjusting the line number
-return CodeType(0, code.co_nlocals, code.co_stacksize,
+return build_code_chunk(code, filename, name, lineno)
-code.co_flags | 0x0040, code.co_code, code.co_consts,
-code.co_names, code.co_varnames, filename, name,
-lineno, code.co_lnotab, (), ())
 except RuntimeError:
 return code
 def _new(class_, *args, **kwargs):
 self.locals = [CONSTANTS]
 def _extract_names(self, node):
 names = set()
 def _process(node):
+if not IS_PYTHON2 and isinstance(node, _ast.arg):
+names.add(node.arg)
 if isinstance(node, _ast.Name):
 names.add(node.id)
 elif isinstance(node, _ast.alias):
 names.add(node.asname or node.name)
 elif isinstance(node, _ast.Tuple):
 for elt in node.names:
 _process(elt)
 return names
 def visit_Str(self, node):
-if isinstance(node.s, str):
+if not isinstance(node.s, unicode):
 try: # If the string is ASCII, return a `str` object
 node.s.decode('ascii')
 except ValueError: # Otherwise return a `unicode` object
 return _new(_ast.Str, node.s.decode('utf-8'))
 return node

Mercurial > genshi > genshi-test

comparison genshi/template/eval.py @ 934:7c9ec79caedc