[Python-checkins] cpython (merge 3.5 -> default): Issue #25380: Fixed protocol for the STACK_GLOBAL opcode in

[serhiy.storchaka]

https://hg.python.org/cpython/rev/f584dadc640f
changeset:   98726:f584dadc640f
parent:      98723:d6fcda2b9b5e
parent:      98725:4115eabc3a6d
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Oct 13 21:14:01 2015 +0300
summary:
  Issue #25380: Fixed protocol for the STACK_GLOBAL opcode in
pickletools.opcodes.

files:
  Lib/pickletools.py |  2 +-
  Misc/NEWS          |  3 +++
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/pickletools.py b/Lib/pickletools.py
--- a/Lib/pickletools.py
+++ b/Lib/pickletools.py
@@ -1898,7 +1898,7 @@
       arg=None,
       stack_before=[pyunicode, pyunicode],
       stack_after=[anyobject],
-      proto=0,
+      proto=4,
       doc="""Push a global object (module.attr) on the stack.
       """),
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,6 +73,9 @@
 - Issue #25316: distutils raises OSError instead of DistutilsPlatformError
   when MSVC is not installed.
 
+- Issue #25380: Fixed protocol for the STACK_GLOBAL opcode in
+  pickletools.opcodes.
+
 - Issue #23972: Updates asyncio datagram create method allowing reuseport
   and reuseaddr socket options to be set prior to binding the socket.
   Mirroring the existing asyncio create_server method the reuseaddr option

-- 
Repository URL: https://hg.python.org/cpython