diff markup/eval.py @ 165:54a4be707664 trunk

Fix handling of keyword arguments in `py:def` directive. Thanks to Christian Boos for reporting the problem and providing the basic patch for this change.
author cmlenz
date Thu, 17 Aug 2006 14:02:58 +0000
parents 47bbd9d2a5af
children 1999291f7a30
line wrap: on
line diff
--- a/markup/eval.py
+++ b/markup/eval.py
@@ -65,12 +65,15 @@
     __slots__ = ['source', 'code']
 
     def __init__(self, source, filename=None, lineno=-1):
-        """Create the expression.
-        
-        @param source: the expression as string
-        """
-        self.source = source
-        self.code = _compile(self, filename, lineno)
+        if isinstance(source, basestring):
+            self.source = source
+            self.code = _compile(parse(source, 'eval'), source,
+                                 filename=filename, lineno=lineno)
+        else:
+            assert isinstance(source, ast.Node)
+            self.source = '?'
+            self.code = _compile(ast.Expression(source), filename=filename,
+                                 lineno=lineno)
 
     def __repr__(self):
         return '<Expression "%s">' % self.source
@@ -92,8 +95,8 @@
         return retval
 
 
-def _compile(expr, filename=None, lineno=-1):
-    tree = ExpressionASTTransformer().visit(parse(expr.source, 'eval'))
+def _compile(node, source=None, filename=None, lineno=-1):
+    tree = ExpressionASTTransformer().visit(node)
     if isinstance(filename, unicode):
         # unicode file names not allowed for code objects
         filename = filename.encode('utf-8', 'replace')
@@ -111,8 +114,9 @@
     # clone the code object while adjusting the line number
     return new.code(0, code.co_nlocals, code.co_stacksize,
                     code.co_flags | 0x0040, code.co_code, code.co_consts,
-                    code.co_names, code.co_varnames, filename, repr(expr),
-                    lineno, code.co_lnotab, (), ())
+                    code.co_names, code.co_varnames, filename,
+                    '<Expression "%s">' % (str(source) or '?'), lineno,
+                    code.co_lnotab, (), ())
 
 def _lookup_name(data, name, locals_=None):
     val = None
Copyright (C) 2012-2017 Edgewall Software