Commit 1e52f513 authored by Evan Simpson's avatar Evan Simpson

Changes to module security

parent 9fbc3ead
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
# #
############################################################################## ##############################################################################
__version__='$Revision: 1.1 $'[11:-2] __version__='$Revision: 1.2 $'[11:-2]
from zbytecodehacks.VSExec import SafeBlock, GuardedBinaryOps, \ from zbytecodehacks.VSExec import SafeBlock, GuardedBinaryOps, \
UntupleFunction, RedirectWrites, WriteGuard, RedirectReads, ReadGuard, \ UntupleFunction, RedirectWrites, WriteGuard, RedirectReads, ReadGuard, \
...@@ -235,7 +235,9 @@ def load_module(module, mname, mnameparts, validate, globals, locals): ...@@ -235,7 +235,9 @@ def load_module(module, mname, mnameparts, validate, globals, locals):
return return
__import__(mname, globals, locals) __import__(mname, globals, locals)
nextmodule = modules[mname] nextmodule = modules[mname]
nextmodule.ZopeSecurity = modsec[mname] if not hasattr(nextmodule, 'ZopeSecurity'):
nextmodule.ZopeSecurity = zs = modsec[mname]
zs.apply(nextmodule)
if module and not validate(module, module, nextname, nextmodule): if module and not validate(module, module, nextname, nextmodule):
return return
module = nextmodule module = nextmodule
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment