Merged revisions 79034 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79034 | benjamin.peterson | 2010-03-17 15:41:42 -0500 (Wed, 17 Mar 2010) | 1 line
prevent lambda functions from having docstrings #8164
........
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 1de9027..90d6b87 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -292,9 +292,9 @@
f1, f2 = f()
self.assertNotEqual(id(f1.__code__), id(f2.__code__))
-## def test_unicode_encoding(self):
-## code = "# -*- coding: utf-8 -*-\npass\n"
-## self.assertRaises(SyntaxError, compile, code, "tmp", "exec")
+ def test_lambda_doc(self):
+ l = lambda: "foo"
+ self.assertIsNone(l.__doc__)
def test_subscripts(self):
# SF bug 1448804
diff --git a/Python/compile.c b/Python/compile.c
index 2c58d44..62fa46c 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1660,6 +1660,11 @@
if (!compiler_enter_scope(c, name, (void *)e, e->lineno))
return 0;
+ /* Make None the first constant, so the lambda can't have a
+ docstring. */
+ if (compiler_add_o(c, c->u->u_consts, Py_None) < 0)
+ return 0;
+
c->u->u_argcount = asdl_seq_LEN(args->args);
c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
VISIT_IN_SCOPE(c, expr, e->v.Lambda.body);