[pypy-commit] pypy continulet-pickle: Revert this check. It seems that w_globals cannot and should not be null.

arigo noreply at buildbot.pypy.org
Wed Sep 14 21:52:21 CEST 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: continulet-pickle
Changeset: r47276:b1917be98364
Date: 2011-09-14 20:55 +0200
http://bitbucket.org/pypy/pypy/changeset/b1917be98364/

Log:	Revert this check. It seems that w_globals cannot and should not be
	null.

diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/interpreter/pyframe.py
@@ -66,7 +66,7 @@
         make_sure_not_resized(self.locals_stack_w)
         check_nonneg(self.nlocals)
         #
-        if space.config.objspace.honor__builtins__ and w_globals is not None:
+        if space.config.objspace.honor__builtins__:
             self.builtin = space.builtin.pick_builtin(w_globals)
         # regular functions always have CO_OPTIMIZED and CO_NEWLOCALS.
         # class bodies only have CO_NEWLOCALS.


More information about the pypy-commit mailing list