Attachment 315120 Details for Bug 460334 – patch from upstream fixes

[patch] patch from upstream fixes

python-2.5.1-optimize-docstrings-out.patch (text/plain), 1.39 KB, created by Tomeu Vizoso on 2008-08-27 17:00:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomeu Vizoso

Created: 2008-08-27 17:00:28 UTC

Size: 1.39 KB

patch

obsolete

>--- Python-2.5.1/Python/compile.c.orig	2007/06/01 07:29:12	55731
>+++ Python-2.5.1/Python/compile.c	2007/06/01 11:33:33	55732
>@@ -1781,9 +1781,11 @@
> 	st = (stmt_ty)asdl_seq_GET(stmts, 0);
> 	if (compiler_isdocstring(st)) {
> 		i = 1;
>-		VISIT(c, expr, st->v.Expr.value);
>-		if (!compiler_nameop(c, __doc__, Store))
>-			return 0;
>+                if (Py_OptimizeFlag < 2) {
>+    		    VISIT(c, expr, st->v.Expr.value);
>+    		    if (!compiler_nameop(c, __doc__, Store))
>+		    	    return 0;
>+                }
> 	}
> 	for (; i < asdl_seq_LEN(stmts); i++)
> 	    VISIT(c, stmt, (stmt_ty)asdl_seq_GET(stmts, i));
>diff -ru Python-2.5.1.orig/Python/compile.c Python-2.5.1/Python/compile.c
>--- Python-2.5.1.orig/Python/compile.c	2007-03-02 14:19:05.000000000 -0500
>+++ Python-2.5.1/Python/compile.c	2008-08-27 10:30:33.000000000 -0400
>@@ -1779,7 +1779,7 @@
> 	if (!asdl_seq_LEN(stmts))
> 		return 1;
> 	st = (stmt_ty)asdl_seq_GET(stmts, 0);
>-	if (compiler_isdocstring(st)) {
>+	if (compiler_isdocstring(st) && Py_OptimizeFlag < 2) {
> 		i = 1;
> 		VISIT(c, expr, st->v.Expr.value);
> 		if (!compiler_nameop(c, __doc__, Store))
>@@ -1982,7 +1982,7 @@
> 
> 	st = (stmt_ty)asdl_seq_GET(s->v.FunctionDef.body, 0);
> 	docstring = compiler_isdocstring(st);
>-	if (docstring)
>+	if (docstring && Py_OptimizeFlag < 2)
> 	    first_const = st->v.Expr.value->v.Str.s;
> 	if (compiler_add_o(c, c->u->u_consts, first_const) < 0)	 {
> 	    compiler_exit_scope(c);

Actions: View | Diff

Attachments on bug 460334: 315120 | 315125