diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-01-18 22:40:43 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-01-18 22:40:43 (GMT) |
| commit | dd08d4a1131c5091be95d0fcdbbde2c49abbe69c (patch) | |
| tree | b9a5dacb57a4002a0736da30e25b6f1374932b1c /Python | |
| parent | 5f5f01394aac4fb879cac220a98d332d19f4f18b (diff) | |
| download | cpython-dd08d4a1131c5091be95d0fcdbbde2c49abbe69c.zip cpython-dd08d4a1131c5091be95d0fcdbbde2c49abbe69c.tar.gz cpython-dd08d4a1131c5091be95d0fcdbbde2c49abbe69c.tar.bz2 | |
Merged revisions 68746 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r68746 | benjamin.peterson | 2009-01-18 16:27:04 -0600 (Sun, 18 Jan 2009) | 55 lines
Merged revisions 68633,68648,68667,68706,68718,68720-68721,68724-68727,68739 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68633 | thomas.heller | 2009-01-16 12:53:44 -0600 (Fri, 16 Jan 2009) | 3 lines
Change an example in the docs to avoid a mistake when the code is copy
pasted and changed afterwards.
........
r68648 | benjamin.peterson | 2009-01-16 22:28:57 -0600 (Fri, 16 Jan 2009) | 1 line
use enumerate
........
r68667 | amaury.forgeotdarc | 2009-01-17 14:18:59 -0600 (Sat, 17 Jan 2009) | 3 lines
#4077: No need to append \n when calling Py_FatalError
+ fix a declaration to make it match the one in pythonrun.h
........
r68706 | benjamin.peterson | 2009-01-17 19:28:46 -0600 (Sat, 17 Jan 2009) | 1 line
fix grammar
........
r68718 | georg.brandl | 2009-01-18 04:42:35 -0600 (Sun, 18 Jan 2009) | 1 line
#4976: union() and intersection() take multiple args, but talk about "the other".
........
r68720 | georg.brandl | 2009-01-18 04:45:22 -0600 (Sun, 18 Jan 2009) | 1 line
#4974: fix redundant mention of lists and tuples.
........
r68721 | georg.brandl | 2009-01-18 04:48:16 -0600 (Sun, 18 Jan 2009) | 1 line
#4914: trunc is in math.
........
r68724 | georg.brandl | 2009-01-18 07:24:10 -0600 (Sun, 18 Jan 2009) | 1 line
#4979: correct result range for some random functions.
........
r68725 | georg.brandl | 2009-01-18 07:47:26 -0600 (Sun, 18 Jan 2009) | 1 line
#4857: fix augmented assignment target spec.
........
r68726 | georg.brandl | 2009-01-18 08:41:52 -0600 (Sun, 18 Jan 2009) | 1 line
#4923: clarify what was added.
........
r68727 | georg.brandl | 2009-01-18 12:25:30 -0600 (Sun, 18 Jan 2009) | 1 line
#4986: augassigns are not expressions.
........
r68739 | benjamin.peterson | 2009-01-18 15:11:38 -0600 (Sun, 18 Jan 2009) | 1 line
fix test that wasn't working as expected #4990
........
................
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ast.c | 2 | ||||
| -rw-r--r-- | Python/compile.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Python/ast.c b/Python/ast.c index aaf158f..b08cf9b 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -191,7 +191,7 @@ num_stmts(const node *n) default: { char buf[128]; - sprintf(buf, "Non-statement found: %d %d\n", + sprintf(buf, "Non-statement found: %d %d", TYPE(n), NCH(n)); Py_FatalError(buf); } diff --git a/Python/compile.c b/Python/compile.c index 50eb169..1d98c86 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -1237,7 +1237,7 @@ get_ref_type(struct compiler *c, PyObject *name) char buf[350]; PyOS_snprintf(buf, sizeof(buf), "unknown scope for %.100s in %.100s(%s) in %s\n" - "symbols: %s\nlocals: %s\nglobals: %s\n", + "symbols: %s\nlocals: %s\nglobals: %s", PyBytes_AS_STRING(name), PyBytes_AS_STRING(c->u->u_name), PyObject_REPR(c->u->u_ste->ste_id), |