diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-04-16 14:54:27 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-04-16 14:54:27 -0700 |
| commit | e10c2d6ab9e3ee5ebeca76a34dd93d624b579da1 (patch) | |
| tree | 2a0216a274628659694e875dd03ffe65ab5344ad /Python/symtable.c | |
| parent | 52fdbac919f35a276a2924a1dfe8b71c2b497db2 (diff) | |
| parent | 88a7179f982d5982844e7e57c303c2df1f5e7854 (diff) | |
| download | cpython-e10c2d6ab9e3ee5ebeca76a34dd93d624b579da1.tar.gz | |
merge 3.5 (#26659)
Diffstat (limited to 'Python/symtable.c')
| -rw-r--r-- | Python/symtable.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Python/symtable.c b/Python/symtable.c index 6d1a62b782..558bb06bd3 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -160,7 +160,7 @@ PyTypeObject PySTEntry_Type = { }; static int symtable_analyze(struct symtable *st); -static int symtable_warn(struct symtable *st, char *msg, int lineno); +static int symtable_warn(struct symtable *st, const char *msg, int lineno); static int symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block, void *ast, int lineno, int col_offset); @@ -908,7 +908,7 @@ symtable_analyze(struct symtable *st) static int -symtable_warn(struct symtable *st, char *msg, int lineno) +symtable_warn(struct symtable *st, const char *msg, int lineno) { PyObject *message = PyUnicode_FromString(msg); if (message == NULL) @@ -1447,6 +1447,15 @@ symtable_visit_expr(struct symtable *st, expr_ty e) VISIT_SEQ(st, expr, e->v.Call.args); VISIT_SEQ_WITH_NULL(st, keyword, e->v.Call.keywords); break; + case FormattedValue_kind: + VISIT(st, expr, e->v.FormattedValue.value); + if (e->v.FormattedValue.format_spec) + VISIT(st, expr, e->v.FormattedValue.format_spec); + break; + case JoinedStr_kind: + VISIT_SEQ(st, expr, e->v.JoinedStr.values); + break; + case Constant_kind: case Num_kind: case Str_kind: case Bytes_kind: |