Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: exctrans
Changeset: r81868:f08b79d813f5
Date: 2016-01-19 20:00 +0000
http://bitbucket.org/pypy/pypy/changeset/f08b79d813f5/
Log: simplify code
diff --git a/rpython/translator/c/node.py b/rpython/translator/c/node.py
--- a/rpython/translator/c/node.py
+++ b/rpython/translator/c/node.py
@@ -903,9 +903,9 @@
funcgen.implementation_end()
def new_funcnode(db, T, obj, forcename=None):
- sandbox = db.sandbox and need_sandboxing(obj)
- if sandbox:
- if getattr(obj, 'external', None) is not None:
+ if db.sandbox:
+ if (getattr(obj, 'external', None) is not None and
+ not obj._safe_not_sandboxed):
from rpython.translator.sandbox import rsandbox
obj.__dict__['graph'] = rsandbox.get_sandbox_stub(
obj, db.translator.rtyper)
@@ -918,12 +918,6 @@
name = _select_name(db, obj)
return FuncNode(db, T, obj, name)
-def need_sandboxing(fnobj):
- if hasattr(fnobj, '_safe_not_sandboxed'):
- return not fnobj._safe_not_sandboxed
- else:
- return "if_external"
-
def select_function_code_generators(fnobj, db, functionname):
if hasattr(fnobj, 'graph'):
exception_policy = getattr(fnobj, 'exception_policy', None)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
