[pypy-commit] pypy py3k: apply stdlib changes from e953dfbc7f0a

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r64806:739db6f6edc0
Date: 2013-06-05 14:44 -0700
http://bitbucket.org/pypy/pypy/changeset/739db6f6edc0/

Log:	apply stdlib changes from e953dfbc7f0a

diff --git a/lib-python/3/opcode.py b/lib-python/3/opcode.py
--- a/lib-python/3/opcode.py
+++ b/lib-python/3/opcode.py
@@ -182,5 +182,6 @@
 hasname.append(201)
 def_op('CALL_METHOD', 202)            # #args not including 'self'
 def_op('BUILD_LIST_FROM_ARG', 203)
+jrel_op('JUMP_IF_NOT_DEBUG', 204)     # jump over assert statements
 
 del def_op, name_op, jrel_op, jabs_op
diff --git a/lib-python/3/test/test_code.py b/lib-python/3/test/test_code.py
--- a/lib-python/3/test/test_code.py
+++ b/lib-python/3/test/test_code.py
@@ -81,7 +81,7 @@
 cellvars: ()
 freevars: ()
 nlocals: 0
-flags: 67
+flags: 1048643
 consts: ("'doc string'", 'None')
 
 >>> def keywordonly_args(a,b,*,k1):
diff --git a/lib-python/3/test/test_dis.py b/lib-python/3/test/test_dis.py
--- a/lib-python/3/test/test_dis.py
+++ b/lib-python/3/test/test_dis.py
@@ -218,7 +218,7 @@
 Kw-only arguments: 0
 Number of locals:  1
 Stack size:        4
-Flags:             OPTIMIZED, NEWLOCALS, NOFREE
+Flags:             OPTIMIZED, NEWLOCALS, NOFREE, 0x100000
 Constants:
    0: %r
    1: '__func__'