traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[3.7] bpo-32711: Fix warnings for Python/ast_unparse.c (GH-5426) (#5475) 

* bpo-32711: Fix warnings for Python/ast_unparse.c
(cherry picked from commit 83ab995871)

Co-authored-by: Stéphane Wirtel <stephane@wirtel.be>
This commit is contained in:
Miss Islington (bot) 2018-02-01 09:41:24 -08:00 committed by Christian Heimes
parent 4d6543005d
commit 78758f29b1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2018-01-29-14-36-37.bpo-32711.8hQFJP.rst Normal file
View File

@ -0,0 +1 @@
Fix the warning messages for Python/ast_unparse.c. Patch by Stéphane Wirtel

8
Python/ast_unparse.c
View File

@ -100,6 +100,8 @@ append_ast_binop(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)
case BitAnd: op = " & "; break; case BitAnd: op = " & "; break;
case FloorDiv: op = " // "; break; case FloorDiv: op = " // "; break;
case Pow: op = " ** "; break; case Pow: op = " ** "; break;
default:
Py_UNREACHABLE();
} }
if (-1 == append_charp(writer, op)) { if (-1 == append_charp(writer, op)) {
@ -127,6 +129,8 @@ append_ast_unaryop(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)
case Not: op = "not "; break; case Not: op = "not "; break;
case UAdd: op = "+"; break; case UAdd: op = "+"; break;
case USub: op = "-"; break; case USub: op = "-"; break;
default:
Py_UNREACHABLE();
} }
if (-1 == append_charp(writer, op)) { if (-1 == append_charp(writer, op)) {
@ -856,7 +860,7 @@ append_formattedvalue(_PyUnicodeWriter *writer, expr_ty e, bool is_format_spec)
return -1; return -1;
} }
} }
if (e->v.FormattedValue.format_spec > 0) { if (e->v.FormattedValue.format_spec) {
if (-1 == _PyUnicodeWriter_WriteASCIIString(writer, ":", 1) || if (-1 == _PyUnicodeWriter_WriteASCIIString(writer, ":", 1) ||
-1 == append_fstring_element(writer, -1 == append_fstring_element(writer,
e->v.FormattedValue.format_spec, e->v.FormattedValue.format_spec,
@ -1119,7 +1123,7 @@ append_ast_expr(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)
} }
static int static int
maybe_init_static_strings() maybe_init_static_strings(void)
{ {
if (!_str_open_br && if (!_str_open_br &&
!(_str_open_br = PyUnicode_InternFromString("{"))) { !(_str_open_br = PyUnicode_InternFromString("{"))) {