Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r62706:01dd3f95cc5e
Date: 2013-03-23 12:38 -0700
http://bitbucket.org/pypy/pypy/changeset/01dd3f95cc5e/
Log: merge
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -277,18 +277,13 @@
def __init__(self, space):
Cache.__init__(self)
self.space = space
+
def _build(self, key):
- val = self.space.enter_cache_building_mode()
- try:
- return self.build(key)
- finally:
- self.space.leave_cache_building_mode(val)
+ return self.build(key)
+
def _ready(self, result):
- val = self.space.enter_cache_building_mode()
- try:
- return self.ready(result)
- finally:
- self.space.leave_cache_building_mode(val)
+ return self.ready(result)
+
def ready(self, result):
pass
@@ -577,11 +572,6 @@
"""NOT_RPYTHON: Abstract method that should put some minimal
content into the w_builtins."""
- def enter_cache_building_mode(self):
- "hook for the flow object space"
- def leave_cache_building_mode(self, val):
- "hook for the flow object space"
-
@jit.loop_invariant
def getexecutioncontext(self):
"Return what we consider to be the active execution context."
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
