Author: Ronan Lamy <[email protected]>
Branch:
Changeset: r74584:d86dde387f83
Date: 2014-11-19 00:13 +0000
http://bitbucket.org/pypy/pypy/changeset/d86dde387f83/
Log: remove obsolete special case
diff --git a/rpython/flowspace/flowcontext.py b/rpython/flowspace/flowcontext.py
--- a/rpython/flowspace/flowcontext.py
+++ b/rpython/flowspace/flowcontext.py
@@ -856,14 +856,9 @@
def WITH_CLEANUP(self, oparg):
# Note: RPython context managers receive None in lieu of tracebacks
# and cannot suppress the exception.
- # This opcode changed a lot between CPython versions
- if sys.version_info >= (2, 6):
- unroller = self.popvalue()
- w_exitfunc = self.popvalue()
- self.pushvalue(unroller)
- else:
- w_exitfunc = self.popvalue()
- unroller = self.peekvalue(0)
+ unroller = self.popvalue()
+ w_exitfunc = self.popvalue()
+ self.pushvalue(unroller)
if isinstance(unroller, Raise):
w_exc = unroller.w_exc
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
