[pypy-commit] pypy default: kill now-dead code
fijal
noreply at buildbot.pypy.org
Wed Nov 7 12:01:05 CET 2012
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch:
Changeset: r58776:3f28ea1e9008
Date: 2012-11-07 13:00 +0200
http://bitbucket.org/pypy/pypy/changeset/3f28ea1e9008/
Log: kill now-dead code
diff --git a/pypy/interpreter/nestedscope.py b/pypy/interpreter/nestedscope.py
--- a/pypy/interpreter/nestedscope.py
+++ b/pypy/interpreter/nestedscope.py
@@ -217,18 +217,9 @@
def MAKE_CLOSURE(self, numdefaults, next_instr):
w_codeobj = self.popvalue()
codeobj = self.space.interp_w(pycode.PyCode, w_codeobj)
- if codeobj.magic >= 0xa0df281: # CPython 2.5 AST branch merge
- w_freevarstuple = self.popvalue()
- freevars = [self.space.interp_w(Cell, cell)
- for cell in self.space.fixedview(w_freevarstuple)]
- else:
- n = len(codeobj.co_freevars)
- freevars = [None] * n
- while True:
- n -= 1
- if n < 0:
- break
- freevars[n] = self.space.interp_w(Cell, self.popvalue())
+ w_freevarstuple = self.popvalue()
+ freevars = [self.space.interp_w(Cell, cell)
+ for cell in self.space.fixedview(w_freevarstuple)]
defaultarguments = self.popvalues(numdefaults)
fn = function.Function(self.space, codeobj, self.w_globals,
defaultarguments, freevars)
More information about the pypy-commit
mailing list