From 98297ee7815939b124156e438b22bd652d67b5db Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 6 Nov 2007 21:34:58 +0000 Subject: Merging the py3k-pep3137 branch back into the py3k branch. No detailed change log; just check out the change log for the py3k-pep3137 branch. The most obvious changes: - str8 renamed to bytes (PyString at the C level); - bytes renamed to buffer (PyBytes at the C level); - PyString and PyUnicode are no longer compatible. I.e. we now have an immutable bytes type and a mutable bytes type. The behavior of PyString was modified quite a bit, to make it more bytes-like. Some changes are still on the to-do list. --- Python/compile.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'Python/compile.c') diff --git a/Python/compile.c b/Python/compile.c index 93087dba84..80c97eba6a 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -787,8 +787,6 @@ opcode_stack_effect(int opcode, int oparg) return 1-oparg; case BUILD_MAP: return 1; - case MAKE_BYTES: - return 0; case LOAD_ATTR: return 0; case COMPARE_OP: @@ -3222,7 +3220,6 @@ compiler_visit_expr(struct compiler *c, expr_ty e) break; case Bytes_kind: ADDOP_O(c, LOAD_CONST, e->v.Bytes.s, consts); - ADDOP(c, MAKE_BYTES); break; case Ellipsis_kind: ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts); -- cgit v1.2.1