diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-09-11 04:11:26 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-09-11 04:11:26 (GMT) |
| commit | 7920b7063d28c8032f30eb7dd87cd88113e9741c (patch) | |
| tree | b4eb3b80d41fe037beb0a17a1dfe8af53e0f6557 /Python | |
| parent | 4b55a9300a99e078056b1ce879d63b872212460f (diff) | |
| parent | b6855150397a86da84c30d1144075d4609b339be (diff) | |
| download | cpython-7920b7063d28c8032f30eb7dd87cd88113e9741c.zip cpython-7920b7063d28c8032f30eb7dd87cd88113e9741c.tar.gz cpython-7920b7063d28c8032f30eb7dd87cd88113e9741c.tar.bz2 | |
merge 3.5 (#25060)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/compile.c | 2 | ||||
| -rw-r--r-- | Python/importlib_external.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Python/compile.c b/Python/compile.c index b246c3b..a6884ec 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -985,7 +985,7 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) case BUILD_MAP_UNPACK_WITH_CALL: return 1 - (oparg & 0xFF); case BUILD_MAP: - return 1; + return 1 - 2*oparg; case LOAD_ATTR: return 0; case COMPARE_OP: diff --git a/Python/importlib_external.h b/Python/importlib_external.h index aea434c..48d6be5 100644 --- a/Python/importlib_external.h +++ b/Python/importlib_external.h @@ -1395,7 +1395,7 @@ const unsigned char _Py_M__importlib_external[] = { 32,83,111,117,114,99,101,76,111,97,100,101,114,32,117,115, 105,110,103,32,116,104,101,32,102,105,108,101,32,115,121,115, 116,101,109,46,99,2,0,0,0,0,0,0,0,3,0,0, - 0,5,0,0,0,67,0,0,0,115,34,0,0,0,116,0, + 0,4,0,0,0,67,0,0,0,115,34,0,0,0,116,0, 0,124,1,0,131,1,0,125,2,0,100,1,0,124,2,0, 106,1,0,100,2,0,124,2,0,106,2,0,105,2,0,83, 41,3,122,33,82,101,116,117,114,110,32,116,104,101,32,109, |