Skip to content

remove useless and potentially dangerous module cleanup #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skogsbaer merged 1 commit into from
Apr 9, 2026
Merged

remove useless and potentially dangerous module cleanup #206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 1 addition & 27 deletions python/code/wypp/runCode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,31 +86,6 @@ def debugModule(name):
print("Origin:", spec.origin)
print("Loader:", type(spec.loader).__name__)

@contextmanager
def freshModules():
original_modules = sys.modules.copy()
stdlib_path = os.path.dirname(os.__file__)
whitelist = ('sys', 'os', 'contextlib', 'runpy', 'wypp', '__main__', '__wypp__')
def is_core(name, module):
if name in sys.stdlib_module_names or name in sys.builtin_module_names:
return True
module_file = getattr(module, '__file__', None)
if module_file and module_file.startswith(stdlib_path):
return True
if name in whitelist:
return True
return False

try:
for mod_name in list(sys.modules.keys()):
if not is_core(mod_name, sys.modules[mod_name]):
del sys.modules[mod_name]
yield
finally:
# 4. Restore everything
sys.modules.clear()
sys.modules.update(original_modules)

def runCode(fileToRun, globals, doTypecheck=True, extraDirs=None) -> dict:
if not extraDirs:
extraDirs = []
Expand All @@ -119,8 +94,7 @@ def runCode(fileToRun, globals, doTypecheck=True, extraDirs=None) -> dict:
sys.dont_write_bytecode = True
if DEBUG:
debugModule(modName)
with freshModules():
res = runpy.run_module(modName, init_globals=globals, run_name='__wypp__', alter_sys=False)
res = runpy.run_module(modName, init_globals=globals, run_name='__wypp__', alter_sys=False)
return res

def runStudentCode(fileToRun, globals, onlyCheckRunnable, doTypecheck=True, extraDirs=None) -> dict:
Expand Down
Loading