[pypy-commit] pypy py3.5: Fix initialisation of exhausted generators when unpickling
rlamy
pypy.commits at gmail.com
Wed Oct 12 14:02:01 EDT 2016
Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r87735:d6480aa7fe7d
Date: 2016-10-12 19:01 +0100
http://bitbucket.org/pypy/pypy/changeset/d6480aa7fe7d/
Log: Fix initialisation of exhausted generators when unpickling
diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -47,20 +47,16 @@
def descr__reduce__(self, space):
from pypy.interpreter.mixedmodule import MixedModule
- w_mod = space.getbuiltinmodule('_pickle_support')
- mod = space.interp_w(MixedModule, w_mod)
+ w_mod = space.getbuiltinmodule('_pickle_support')
+ mod = space.interp_w(MixedModule, w_mod)
new_inst = mod.get(self.KIND + '_new')
- w = space.wrap
+ w = space.wrap
if self.frame:
w_frame = self.frame._reduce_state(space)
else:
w_frame = space.w_None
- tup = [
- w_frame,
- w(self.running),
- ]
-
+ tup = [w_frame, w(self.running)]
return space.newtuple([new_inst, space.newtuple([]),
space.newtuple(tup)])
@@ -72,6 +68,8 @@
self.frame = None
self.space = space
self.pycode = None
+ self._name = None
+ self._qualname = None
else:
frame = instantiate(space.FrameClass) # XXX fish
frame.descr__setstate__(space, w_framestate)
More information about the pypy-commit
mailing list