[pypy-commit] pypy continulet-pickle: hg merge default

arigo noreply at buildbot.pypy.org
Wed Sep 14 18:24:12 CEST 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: continulet-pickle
Changeset: r47267:b9c6f30776c0
Date: 2011-09-14 14:24 +0200
http://bitbucket.org/pypy/pypy/changeset/b9c6f30776c0/

Log:	hg merge default

diff --git a/pypy/module/_continuation/interp_continuation.py b/pypy/module/_continuation/interp_continuation.py
--- a/pypy/module/_continuation/interp_continuation.py
+++ b/pypy/module/_continuation/interp_continuation.py
@@ -229,7 +229,7 @@
         assert self.sthread.ec.topframeref() is None
         self.sthread.ec.topframeref = jit.non_virtual_ref(self.bottomframe)
         if global_state.propagate_exception is not None:
-            raise global_state.propagate_exception   # just propagate it further
+            raise global_state.propagate_exception  # just propagate it further
         if global_state.w_value is not space.w_None:
             raise OperationError(space.w_TypeError, space.wrap(
                 "can't send non-None value to a just-started continulet"))


More information about the pypy-commit mailing list